Commit 1e89ad37 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Fix for bug#103

parent b42d144c

example-data/nfv.xml

+12 −12
Original line number Original line Diff line number Diff line
@@ -188,7 +188,7 @@ 
      <vnf-profile>

      <vnf-profile>

        <id>firewall</id>

        <id>firewall</id>

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

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

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

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

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

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

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

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

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

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

      <vnf-profile>

        <id>firewall</id>

        <id>firewall</id>

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

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

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

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

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

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

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

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

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

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

      <vnf-profile>

        <id>router</id>

        <id>router</id>

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

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

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

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

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

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

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

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

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

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

      <virtual-link-profile>

        <id>mgmt</id>

        <id>mgmt</id>

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

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

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

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

        <max-bitrate-requirements>

        <max-bitrate-requirements>

          <root>1000</root>

          <root>1000</root>

        </max-bitrate-requirements>

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

      <virtual-link-profile>

        <id>r2fw</id>

        <id>r2fw</id>

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

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

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

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

        <max-bitrate-requirements>

        <max-bitrate-requirements>

          <root>10000000</root>

          <root>10000000</root>

        </max-bitrate-requirements>

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

      <vnf-profile>

        <id>firewall</id>

        <id>firewall</id>

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

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

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

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

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

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

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

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

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

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

      <vnf-profile>

        <id>router</id>

        <id>router</id>

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

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

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

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

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

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

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

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

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

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

      <virtual-link-profile>

        <id>fw2dpi</id>

        <id>fw2dpi</id>

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

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

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

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

        <max-bitrate-requirements>

        <max-bitrate-requirements>

          <root>1000000</root>

          <root>1000000</root>

        </max-bitrate-requirements>

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

      <virtual-link-profile>

        <id>mgmt</id>

        <id>mgmt</id>

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

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

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

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

        <max-bitrate-requirements>

        <max-bitrate-requirements>

          <root>1000</root>

          <root>1000</root>

        </max-bitrate-requirements>

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

      <virtual-link-profile>

        <id>r2fw</id>

        <id>r2fw</id>

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

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

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

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

        <max-bitrate-requirements>

        <max-bitrate-requirements>

          <root>1000000</root>

          <root>1000000</root>

        </max-bitrate-requirements>

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

      <vnf-profile>

        <id>router</id>

        <id>router</id>

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

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

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

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

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

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

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

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

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

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

      <virtual-link-profile>

        <id>r2fw</id>

        <id>r2fw</id>

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

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

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

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

        <max-bitrate-requirements>

        <max-bitrate-requirements>

          <root>500</root>

          <root>500</root>

        </max-bitrate-requirements>

        </max-bitrate-requirements>

src/yang/etsi-nfv-common.yang

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

      enum "end-healing";

      enum "start-termination";

      enum "start-termination";

      enum "end-termination";

      enum "end-termination";

      enum "start-vnf-flavor-change";

      enum "start-vnf-flavour-change";

      enum "end-vnf-flavor-change";

      enum "end-vnf-flavour-change";

      enum "start-vnf-operation-change";

      enum "start-vnf-operation-change";

      enum "end-vnf-operation-change";

      enum "end-vnf-operation-change";

      enum "start-vnf-ext-conn-change";

      enum "start-vnf-ext-conn-change";

src/yang/etsi-nfv-ns.yang

+4 −4
Original line number Original line Diff line number Diff line
@@ -676,7 +676,7 @@ submodule etsi-nfv-ns { 
            "GS NFV IFA014: Section 6.3.2.2 NsDf information element";

            "GS NFV IFA014: Section 6.3.2.2 NsDf information element";

        }

        }





        leaf flavor-key {

        leaf flavour-key {

          type leafref {

          type leafref {

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

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

          }

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

               element";

          }

          }





          leaf flavor-id {

          leaf flavour-id {

            mandatory true;

            mandatory true;

            type leafref {

            type leafref {

              path "deref(../vnfd-id)/../df/id";

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

          leaf instantiation-level {

            mandatory true;

            mandatory true;

            type leafref {

            type leafref {

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

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

            }

            }

            description

            description

              "Identifier of the instantiation level of the VNF DF

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

               information element";

          }

          }





          leaf flavor-id {

          leaf flavour-id {

            mandatory true;

            mandatory true;

            type leafref {

            type leafref {

              path "deref(../virtual-link-desc-id)/../df/id";

              path "deref(../virtual-link-desc-id)/../df/id";

src/yang/etsi-nfv-vnf.yang

+433 −39

File changed.

Preview size limit exceeded, changes collapsed.