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

Fix for bug#93

parent 564db7c2

example-data/nfv.xml

+12 −4
Original line number Original line Diff line number Diff line
@@ -243,7 +243,9 @@ 
      <id>fw2dpi</id>

      <id>fw2dpi</id>

      <version>1.0</version>

      <version>1.0</version>

      <connectivity-type>

      <connectivity-type>

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

        <layer-protocol>

	  <protocol>Ethernet</protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>

        <id>normal</id>

        <id>normal</id>
@@ -257,7 +259,9 @@ 
      <id>mgmt</id>

      <id>mgmt</id>

      <version>1.0</version>

      <version>1.0</version>

      <connectivity-type>

      <connectivity-type>

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

        <layer-protocol>

	  <protocol>IPv4</protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>

        <id>normal</id>

        <id>normal</id>
@@ -271,7 +275,9 @@ 
      <id>r2fw</id>

      <id>r2fw</id>

      <version>1.0</version>

      <version>1.0</version>

      <connectivity-type>

      <connectivity-type>

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

        <layer-protocol>

	  <protocol>Ethernet</protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>

        <id>normal</id>

        <id>normal</id>
@@ -465,7 +471,9 @@ 
      <id>r2fw</id>

      <id>r2fw</id>

      <version>1.0</version>

      <version>1.0</version>

      <connectivity-type>

      <connectivity-type>

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

        <layer-protocol>

	  <protocol>IPv4</protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>

        <id>r2fw</id>

        <id>r2fw</id>

src/yang/etsi-nfv-common.yang

+13 −7
Original line number Original line Diff line number Diff line
@@ -253,14 +253,20 @@ submodule etsi-nfv-common { 




  grouping connectivity-type {

  grouping connectivity-type {

    container connectivity-type {

    container connectivity-type {

      leaf layer-protocol {

      list layer-protocol {

        mandatory true;

	key "protocol";



	leaf protocol {

          type identityref {

          type identityref {

            base layer-protocol;

            base layer-protocol;

          }

          }

	}

        description

        description

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

          "Identifies the protocols that the VL uses (Ethernet,

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

           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

        reference

          "GS NFV IFA011: Section 7.1.7.3, ConnectivityType

          "GS NFV IFA011: Section 7.1.7.3, ConnectivityType

           information element.";

           information element.";