Commit af01b8b7 authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'bug#188' into 'master' 

Fix for Bug#188

See merge request !33
parents 2e8b2a5b d4cb663b

example-data/nfv.xml

+17 −17
Original line number Original line Diff line number Diff line
@@ -11,15 +11,15 @@ 
      <name>Firewall VDU</name>

      <name>Firewall VDU</name>

      <int-cpd>

      <int-cpd>

        <id>inside</id>

        <id>inside</id>

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

        <layer-protocol>ethernet</layer-protocol>

      </int-cpd>

      </int-cpd>

      <int-cpd>

      <int-cpd>

        <id>management</id>

        <id>management</id>

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

        <layer-protocol>ethernet</layer-protocol>

      </int-cpd>

      </int-cpd>

      <int-cpd>

      <int-cpd>

        <id>outside</id>

        <id>outside</id>

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

        <layer-protocol>ethernet</layer-protocol>

      </int-cpd>

      </int-cpd>

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

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

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

      <virtual-storage-desc>asa-vsd</virtual-storage-desc>
@@ -52,7 +52,7 @@ 
	<vdu-id>firewall</vdu-id>

	<vdu-id>firewall</vdu-id>

	<cpd>inside</cpd>

	<cpd>inside</cpd>

      </int-cpd>

      </int-cpd>

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

      <layer-protocol>ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>management</id>

      <id>management</id>
@@ -60,7 +60,7 @@ 
	<vdu-id>firewall</vdu-id>

	<vdu-id>firewall</vdu-id>

	<cpd>management</cpd>

	<cpd>management</cpd>

      </int-cpd>

      </int-cpd>

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

      <layer-protocol>ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>outside</id>

      <id>outside</id>
@@ -68,7 +68,7 @@ 
	<vdu-id>firewall</vdu-id>

	<vdu-id>firewall</vdu-id>

	<cpd>outside</cpd>

	<cpd>outside</cpd>

      </int-cpd>

      </int-cpd>

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

      <layer-protocol>ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <df>

    <df>

      <id>normal</id>

      <id>normal</id>
@@ -106,15 +106,15 @@ 
      <name>Router VDU</name>

      <name>Router VDU</name>

      <int-cpd>

      <int-cpd>

        <id>left</id>

        <id>left</id>

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

        <layer-protocol>ethernet</layer-protocol>

      </int-cpd>

      </int-cpd>

      <int-cpd>

      <int-cpd>

        <id>management</id>

        <id>management</id>

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

        <layer-protocol>ethernet</layer-protocol>

      </int-cpd>

      </int-cpd>

      <int-cpd>

      <int-cpd>

        <id>right</id>

        <id>right</id>

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

        <layer-protocol>ethernet</layer-protocol>

      </int-cpd>

      </int-cpd>

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

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

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

      <virtual-storage-desc>csr-vsd</virtual-storage-desc>
@@ -147,7 +147,7 @@ 
	<vdu-id>router</vdu-id>

	<vdu-id>router</vdu-id>

	<cpd>left</cpd>

	<cpd>left</cpd>

      </int-cpd>

      </int-cpd>

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

      <layer-protocol>ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>management</id>

      <id>management</id>
@@ -155,7 +155,7 @@ 
	<vdu-id>router</vdu-id>

	<vdu-id>router</vdu-id>

	<cpd>management</cpd>

	<cpd>management</cpd>

      </int-cpd>

      </int-cpd>

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

      <layer-protocol>ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>right</id>

      <id>right</id>
@@ -163,7 +163,7 @@ 
	<vdu-id>router</vdu-id>

	<vdu-id>router</vdu-id>

	<cpd>right</cpd>

	<cpd>right</cpd>

      </int-cpd>

      </int-cpd>

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

      <layer-protocol>ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <df>

    <df>

      <id>normal</id>

      <id>normal</id>
@@ -243,7 +243,7 @@ 
      <id>fw2dpi</id>

      <id>fw2dpi</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>

        <layer-protocol>

	  <protocol>Ethernet</protocol>

	  <protocol>ethernet</protocol>

	</layer-protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>
@@ -258,7 +258,7 @@ 
      <id>mgmt</id>

      <id>mgmt</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>

        <layer-protocol>

	  <protocol>IPv4</protocol>

	  <protocol>ipv4</protocol>

	</layer-protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>
@@ -273,7 +273,7 @@ 
      <id>r2fw</id>

      <id>r2fw</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>

        <layer-protocol>

	  <protocol>Ethernet</protocol>

	  <protocol>ethernet</protocol>

	</layer-protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>
@@ -498,7 +498,7 @@ 
      <id>r2fw</id>

      <id>r2fw</id>

      <connectivity-type>

      <connectivity-type>

        <layer-protocol>

        <layer-protocol>

	  <protocol>IPv4</protocol>

	  <protocol>ipv4</protocol>

	</layer-protocol>

	</layer-protocol>

      </connectivity-type>

      </connectivity-type>

      <df>

      <df>
@@ -570,7 +570,7 @@ 
    <version>1.0</version>

    <version>1.0</version>

    <ext-cpd>

    <ext-cpd>

      <id>outside</id>

      <id>outside</id>

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

      <layer-protocol>ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

  </pnfd>

  </pnfd>

</nfv>
 
</nfv>

src/yang/etsi-nfv-common.yang

+7 −7
Original line number Original line Diff line number Diff line
@@ -20,22 +20,22 @@ submodule etsi-nfv-common { 
   */

   */

  identity layer-protocol {

  identity layer-protocol {

  }

  }

  identity Ethernet {

  identity ethernet {

    base layer-protocol;

    base layer-protocol;

  }

  }

  identity MPLS {

  identity mpls {

    base layer-protocol;

    base layer-protocol;

  }

  }

  identity ODU2 {

  identity odu2 {

    base layer-protocol;

    base layer-protocol;

  }

  }

  identity IPv4 {

  identity ipv4 {

    base layer-protocol;

    base layer-protocol;

  }

  }

  identity IPv6 {

  identity ipv6 {

    base layer-protocol;

    base layer-protocol;

  }

  }

  identity Pseudo-Wire {

  identity pseudo-wire {

    base layer-protocol;

    base layer-protocol;

  }

  }
@@ -432,7 +432,7 @@ submodule etsi-nfv-common { 
    }

    }





    leaf-list layer-protocol {

    leaf-list layer-protocol {

      default Ethernet;

      default ethernet;

      type identityref {

      type identityref {

        base layer-protocol;

        base layer-protocol;

      }

      }