Commit e9e3597f authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'master' into 'bug#95' 

# Conflicts:
#   src/yang/etsi-nfv-common.yang
#   src/yang/etsi-nfv-ns.yang
#   src/yang/etsi-nfv-vnf.yang
parents 6ee6373f 3a78b0d7

example-data/nfv.xml

+13 −17
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ 
      <vnf-profile>

        <id>firewall</id>

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

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

        <flavour-id>normal</flavour-id>

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

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

        <max-number-of-instances>1</max-number-of-instances>
@@ -241,7 +241,6 @@ 
    </sapd>

    <virtual-link-desc>

      <id>fw2dpi</id>

      <version>1.0</version>

      <connectivity-type>

        <layer-protocol>

	  <protocol>Ethernet</protocol>
@@ -257,7 +256,6 @@ 
    </virtual-link-desc>

    <virtual-link-desc>

      <id>mgmt</id>

      <version>1.0</version>

      <connectivity-type>

        <layer-protocol>

	  <protocol>IPv4</protocol>
@@ -273,7 +271,6 @@ 
    </virtual-link-desc>

    <virtual-link-desc>

      <id>r2fw</id>

      <version>1.0</version>

      <connectivity-type>

        <layer-protocol>

	  <protocol>Ethernet</protocol>
@@ -292,7 +289,7 @@ 
      <vnf-profile>

        <id>firewall</id>

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

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

        <flavour-id>normal</flavour-id>

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

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

        <max-number-of-instances>1</max-number-of-instances>
@@ -314,7 +311,7 @@ 
      <vnf-profile>

        <id>router</id>

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

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

        <flavour-id>normal</flavour-id>

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

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

        <max-number-of-instances>1</max-number-of-instances>
@@ -336,7 +333,7 @@ 
      <virtual-link-profile>

        <id>mgmt</id>

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

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

        <flavour-id>normal</flavour-id>

        <max-bitrate-requirements>

          <root>1000</root>

        </max-bitrate-requirements>
@@ -347,7 +344,7 @@ 
      <virtual-link-profile>

        <id>r2fw</id>

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

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

        <flavour-id>normal</flavour-id>

        <max-bitrate-requirements>

          <root>10000000</root>

        </max-bitrate-requirements>
@@ -373,7 +370,7 @@ 
      <vnf-profile>

        <id>firewall</id>

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

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

        <flavour-id>normal</flavour-id>

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

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

        <max-number-of-instances>1</max-number-of-instances>
@@ -402,7 +399,7 @@ 
      <vnf-profile>

        <id>router</id>

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

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

        <flavour-id>normal</flavour-id>

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

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

        <max-number-of-instances>1</max-number-of-instances>
@@ -435,7 +432,7 @@ 
      <virtual-link-profile>

        <id>fw2dpi</id>

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

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

        <flavour-id>normal</flavour-id>

        <max-bitrate-requirements>

          <root>1000000</root>

        </max-bitrate-requirements>
@@ -446,7 +443,7 @@ 
      <virtual-link-profile>

        <id>mgmt</id>

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

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

        <flavour-id>normal</flavour-id>

        <max-bitrate-requirements>

          <root>1000</root>

        </max-bitrate-requirements>
@@ -457,7 +454,7 @@ 
      <virtual-link-profile>

        <id>r2fw</id>

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

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

        <flavour-id>normal</flavour-id>

        <max-bitrate-requirements>

          <root>1000000</root>

        </max-bitrate-requirements>
@@ -499,7 +496,6 @@ 
    </sapd>

    <virtual-link-desc>

      <id>r2fw</id>

      <version>1.0</version>

      <connectivity-type>

        <layer-protocol>

	  <protocol>IPv4</protocol>
@@ -518,7 +514,7 @@ 
      <vnf-profile>

        <id>router</id>

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

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

        <flavour-id>normal</flavour-id>

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

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

        <max-number-of-instances>1</max-number-of-instances>
@@ -533,7 +529,7 @@ 
      <virtual-link-profile>

        <id>r2fw</id>

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

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

        <flavour-id>r2fw</flavour-id>

        <max-bitrate-requirements>

          <root>500</root>

        </max-bitrate-requirements>

src/yang/etsi-nfv-common.yang

+112 −2
Original line number Diff line number Diff line
@@ -215,8 +215,8 @@ submodule etsi-nfv-common { 
      enum "end-healing";

      enum "start-termination";

      enum "end-termination";

      enum "start-vnf-flavor-change";

      enum "end-vnf-flavor-change";

      enum "start-vnf-flavour-change";

      enum "end-vnf-flavour-change";

      enum "start-vnf-operation-change";

      enum "end-vnf-operation-change";

      enum "start-vnf-ext-conn-change";
@@ -571,5 +571,115 @@ submodule etsi-nfv-common { 
      reference

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

    }



    leaf security-group-rule-id {

      type leafref {

        path "/nfv/vnfd/security-group-rule/id";

      }

      description

        "Reference of the security group rules bound to this

         CPD.";

      reference

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

    }

  }



  grouping security-group-rule {

    list security-group-rule {

      key "id";



      leaf id {

        type string;

        description

          "Identifier of this SecurityGroupRule information

           element.";

        reference

          "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule

           information element.";

      }



      leaf description {

        type string;

        description

          "Human readable description of the security group rule.";

        reference

          "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule

           information element.";

      }



      leaf direction {

        type enumeration {

          enum ingress;

          enum egress;

        }

        default "ingress";

        description

          "The direction in which the security group rule is applied.

           Permitted values: INGRESS, EGRESS. Defaults to INGRESS.";

        reference

          "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule

           information element.";

      }



      leaf ether-type {

        type enumeration {

          enum ipv4;

          enum ipv6;

        }

        default "ipv4";

        description

          "Indicates the protocol carried over the Ethernet layer.

           Permitted values: IPV4, IPV6. Defaults to IPV4.";

        reference

          "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule

           information element.";

      }



      leaf protocol {

        type enumeration {

          enum tcp;

          enum udp;

          enum icmp;

        }

        default "tcp";

        description

          "Indicates the protocol carried over the IP layer.

           Permitted values: any protocol defined in the IANA

           protocol registry, e.g. TCP, UDP, ICMP, etc. Defaults

           to TCP.";

        reference

          "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule

           information element.";

      }



      leaf port-range-min {

        must ". <= ../port-range-max";

        type uint16;

        default "0";

        description

          "Indicates minimum port number in the range that is

           matched by the security group rule. Defaults to 0.";

        reference

          "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule

           information element.";

      }



      leaf port-range-max {

        must ". >= ../port-range-min";

        type uint16;

        default "65535";

        description

          "Indicates maximum port number in the range that is

           matched by the security group rule. Defaults to 65535.";

        reference

          "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule

           information element.";

      }



      description

        "Defines security group rules to be used by the VNF.";

      reference

        "GS NFV IFA011: Section 7.1.2, VNFD information element.";

    }

  }

}

src/yang/etsi-nfv-ns.yang

+54 −33
Original line number Diff line number Diff line
@@ -226,25 +226,6 @@ submodule etsi-nfv-ns { 
             information element";

        }



        leaf provider {

          type string;

          description

            "Defines the organization generating the VLD.";

          reference

            "GS NFV IFA014: Section 6.5.2.2 NsVirtualLinkDesc

             information element";

        }



        leaf version {

          mandatory true;

          type string;

          description

            "Specifies the version of the VLD.";

          reference

            "GS NFV IFA014: Section 6.5.2.2 NsVirtualLinkDesc

             information element";

        }



        uses connectivity-type;



        list df {
@@ -434,25 +415,54 @@ submodule etsi-nfv-ns { 
          key "id";



          description

            "A pool of descriptors of connection points attached to

             one of the constituent VNFs and PNFs and/or one of the

             SAPs of the parent NS or of a nested NS.";

            "Describes a pool of descriptors of connection points

             attached to one of the constituent VNFs and PNFs and/or

             one of the SAPs of the parent NS or of a nested NS.";

          reference

            "GS NFV IFA014: Section 6.4.2.2 Vnffgd information

             element";



          leaf id {

            type string;

          }



          choice constituent-base-element-id {

            mandatory "true";

            container vnf-profile {

              leaf vnf-profile-id {

                must ". = deref(../../vnfd-profile-id)" {

                }

                type leafref {

                  path "/nfv/nsd/df/vnf-profile/id";

                }

              }

            }

            container pnf-profile {

              leaf pnf-profile-id {

                must ". = deref(../../pnfd-profile-id)" {

                }

                type leafref {

                  path "/nfv/nsd/df/pnf-profile/id";

                }

              }

            }

	    container ns-profile {

              leaf ns-profile-id {

                must ". = deref(../../ns-profile-id)" {

                }

                type leafref {

                  path "/nfv/nsd/df/ns-profile/id";

                }

              }

            }

            description

              "Identifier of this CpdPool information element. It

               identifies a pool of descriptors of connection points

               and NS SAPs.";

              "Reference to the profile of an NS constituent.";

            reference

              "GS NFV IFA014: Section 6.4.4.2 CpdPool information

               element";

              "GS NFV IFA014: Section 6.4.8 CpdInConstituentElement

               information element";

          }



          choice cpd-id {

          choice constituent-cpd-id {

            container vnf {

              leaf vnfd-id {

                must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
@@ -483,7 +493,8 @@ submodule etsi-nfv-ns { 
            }

            container ns {

              leaf nsd-id {

                must ". = deref(../../nested-ns-profile-id)/../nsd-id" {

                must ". = deref(../../nested-ns-profile-id)/" +

                     "../nsd-id" {

                }



                type leafref {
@@ -664,7 +675,7 @@ submodule etsi-nfv-ns { 
            "GS NFV IFA014: Section 6.3.2.2 NsDf information element";

        }



        leaf flavor-key {

        leaf flavour-key {

          type leafref {

            path "../monitored-info/id";

          }
@@ -715,7 +726,7 @@ submodule etsi-nfv-ns { 
               element";

          }



          leaf flavor-id {

          leaf flavour-id {

            mandatory true;

            type leafref {

              path "deref(../vnfd-id)/../df/id";
@@ -730,7 +741,7 @@ submodule etsi-nfv-ns { 
          leaf instantiation-level {

            mandatory true;

            type leafref {

              path "deref(../flavor-id)/../instantiation-level/id";

              path "deref(../flavour-id)/../instantiation-level/id";

            }

            description

              "Identifier of the instantiation level of the VNF DF
@@ -964,7 +975,7 @@ submodule etsi-nfv-ns { 
               information element";

          }



          leaf flavor-id {

          leaf flavour-id {

            mandatory true;

            type leafref {

              path "deref(../virtual-link-desc-id)/../df/id";
@@ -1542,6 +1553,16 @@ submodule etsi-nfv-ns { 
                "GS NFV IFA014: Section 6.2.8.2 MonitoringParameter

                 information element";

            }



            leaf collection-period {

              type string;

              description

                "An attribute that describes the periodicity at

                 which to collect the performance information.";

              reference

                "GS NFV IFA014: Section 6.2.8.2 MonitoringParameter

                 information element";

            }

          }

	}

      }

src/yang/etsi-nfv-pnf.yang

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ submodule etsi-nfv-pnf { 
        reference

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

      }

      uses security-group-rule;

    }

  }

}

src/yang/etsi-nfv-vnf.yang

+445 −167

File changed.

Preview size limit exceeded, changes collapsed.