Commit 3a78b0d7 authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'bug#93' into 'master' 

Bug#93

See merge request !26
parents 7a962aa2 130ab486

example-data/nfv.xml

+12 −4
Original line number Diff line number Diff line
@@ -242,7 +242,9 @@ 
    <virtual-link-desc>

      <id>fw2dpi</id>

      <connectivity-type>

        <layer-protocol>Ethernet</layer-protocol>

        <layer-protocol>

	  <protocol>Ethernet</protocol>

	</layer-protocol>

      </connectivity-type>

      <df>

        <id>normal</id>
@@ -255,7 +257,9 @@ 
    <virtual-link-desc>

      <id>mgmt</id>

      <connectivity-type>

        <layer-protocol>IPv4</layer-protocol>

        <layer-protocol>

	  <protocol>IPv4</protocol>

	</layer-protocol>

      </connectivity-type>

      <df>

        <id>normal</id>
@@ -268,7 +272,9 @@ 
    <virtual-link-desc>

      <id>r2fw</id>

      <connectivity-type>

        <layer-protocol>Ethernet</layer-protocol>

        <layer-protocol>

	  <protocol>Ethernet</protocol>

	</layer-protocol>

      </connectivity-type>

      <df>

        <id>normal</id>
@@ -491,7 +497,9 @@ 
    <virtual-link-desc>

      <id>r2fw</id>

      <connectivity-type>

        <layer-protocol>IPv4</layer-protocol>

        <layer-protocol>

	  <protocol>IPv4</protocol>

	</layer-protocol>

      </connectivity-type>

      <df>

        <id>r2fw</id>

src/yang/etsi-nfv-common.yang

+16 −10
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ submodule etsi-nfv-common { 
  description

    "Common data types for ETSI data models.";



  revision 2018-06-19 {

  revision 2019-03-18 {

    description

      "Initial revision



       Common data structures to support VNFD and NSD according to:

       ETSI GS NFV-IFA 014 Ed251v244

       ETSI GS NFV-IFA 011 Ed251v243";

       ETSI GS NFV-IFA 014 Ed261v252

       ETSI GS NFV-IFA 011 Ed261v254";

  }



  /*
@@ -253,14 +253,20 @@ submodule etsi-nfv-common { 


  grouping connectivity-type {

    container connectivity-type {

      leaf layer-protocol {

        mandatory true;

      list layer-protocol {

	key "protocol";



	leaf protocol {

          type identityref {

            base layer-protocol;

          }

	}

        description

          "Identifies the protocol this VL gives access to (Ethernet,

           MPLS, ODU2, IPV4, IPV6, Pseudo-Wire).";

          "Identifies the protocols that the VL uses (Ethernet,

           MPLS, ODU2, IPV4, IPV6, Pseudo-Wire). The top layer

           protocol of the VL protocol stack shall always be provided.

           The lower layer protocols may be included when there are

           specific requirements on these layers.";

        reference

          "GS NFV IFA011: Section 7.1.7.3, ConnectivityType

           information element.";

src/yang/etsi-nfv-ns.yang

+3 −3
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ submodule etsi-nfv-ns { 
  description

    "Models for NS according to ETSI GS NFV-IFA 014.";



  revision 2017-01-20 {

  revision 2019-03-18 {

    description

      "Initial revision

       Common data structure to support NSD according to:

       ETSI GS NFV-IFA 011 Ed251v243";

       ETSI GS NFV-IFA 014 Ed261v252";



    reference

      "ETSI GS NFV-IFA 011 Ed251v243";

      "ETSI GS NFV-IFA 014 Ed261v252";

  }



  grouping resource-handle {

src/yang/etsi-nfv-pnf.yang

+3 −3
Original line number Diff line number Diff line
@@ -12,15 +12,15 @@ submodule etsi-nfv-pnf { 
  description

    "Models for PNFD according to GS NFV-IFA 014.";



  revision 2018-06-25 {

  revision 2019-03-18 {

    description

      "Initial revision.



       Common data structure to support VNFD according to:

       ETSI GS NFV-IFA 014 Ed251v244";

       ETSI GS NFV-IFA 014 Ed261v252";



    reference

      "ETSI GS NFV-IFA 014 Ed251v244";

      "ETSI GS NFV-IFA 014 Ed261v252";

  }



  grouping pnfd {

src/yang/etsi-nfv-vnf.yang

+6 −6
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ submodule etsi-nfv-vnf { 
  description

    "Models for VNFD according to GS NFV-IFA 011.";



  revision 2018-06-19 {

  revision 2019-03-18 {

    description

      "Initial revision.



       Common data structure to support VNFD according to:

       VNFD according to ETSI GS NFV-IFA 011 Ed251v243";

       VNFD according to ETSI GS NFV-IFA 011 Ed261v254";



    reference

      "ETSI GS NFV-IFA 011 Ed251v243";

      "ETSI GS NFV-IFA 011 Ed261v254";

  }



  grouping virtual-network-interface-requirements {