Commit 022fede6 authored by jethanandani's avatar jethanandani
Browse files

Merge branch 'bug#244' into 'v2.7.1' 

Address bug#244

See merge request !47
parents 5e261d31 f433737c

example-data/nfv-nsd.xml

+151 −135
Original line number Diff line number Diff line 
<nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">

<?xml version="1.0" encoding="UTF-8"?>

<config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">

  <nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">

    <vnfd>

      <id>ASA</id>

      <provider>My Company</provider>
@@ -11,15 +13,15 @@ 
	<name>Firewall VDU</name>

	<int-cpd>

          <id>inside</id>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

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

	</int-cpd>

	<int-cpd>

          <id>management</id>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

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

	</int-cpd>

	<int-cpd>

          <id>outside</id>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

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

	</int-cpd>

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

	<virtual-storage-desc>asa-vsd</virtual-storage-desc>
@@ -36,7 +38,7 @@ 
      </virtual-compute-desc>

      <virtual-storage-desc>

	<id>asa-vsd</id>

    <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:root-storage</type-of-storage>

	<type-of-storage>root-storage</type-of-storage>

	<size-of-storage>0</size-of-storage>

      </virtual-storage-desc>

      <sw-image-desc>
@@ -44,7 +46,7 @@ 
	<name>ASA image</name>

	<version>1.1</version>

	<checksum>

	<algorithm xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:sha-224</algorithm>

	  <algorithm>sha-224</algorithm>

	  <hash>deadbeef</hash>

	</checksum>

	<container-format>bare</container-format>
@@ -52,7 +54,7 @@ 
	<min-disk>1</min-disk>

	<min-ram>2.0</min-ram>

	<size>1</size>

      <image>http://www.cisco.com/asa.qcow2</image>

	<image>http://mycompany.images.com/asa.qcow2</image>

      </sw-image-desc>

      <ext-cpd>

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

	  <cpd>inside</cpd>

	</int-cpd>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

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

      </ext-cpd>

      <ext-cpd>

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

	  <cpd>management</cpd>

	</int-cpd>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

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

      </ext-cpd>

      <ext-cpd>

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

	  <cpd>outside</cpd>

	</int-cpd>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

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

      </ext-cpd>

      <df>

	<id>normal</id>
@@ -100,8 +102,21 @@ 
          </vdu-level>

	</instantiation-level>

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

	<lcm-operations-configuration>

	  <scale-vnf-to-level-op-config>

	    <arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>

	  </scale-vnf-to-level-op-config>

	  <terminate-vnf-op-config>

	    <min-graceful-termination>1</min-graceful-termination>

	  </terminate-vnf-op-config>

	  <operate-vnf-op-config>

	    <min-graceful-stop-timeout>1</min-graceful-stop-timeout>

	  </operate-vnf-op-config>

	</lcm-operations-configuration>

      </df>

    </vnfd>

  </nfv>

  <nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">

    <nsd>

      <id>firewall-nsd</id>

      <vnfd-id>ASA</vnfd-id>
@@ -134,3 +149,4 @@ 
      </df>

    </nsd>

  </nsd>

</config>

src/yang/etsi-nfv-ns.yang

+34 −30
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ submodule etsi-nfv-ns { 


    leaf-list vnfd-id {

      type leafref {

        path "../../vnfd/id";

        path "/nfv:nfv/nfv:vnfd/nfv:id";

      }

      description

        "References the VNFD of a constituent VNF.";
@@ -108,7 +108,7 @@ submodule etsi-nfv-ns { 


    leaf-list pnfd-id {

      type leafref {

        path "../../pnfd/id";

        path "/nfv:nfv/nfv:pnfd/nfv:id";

      }

      description

        "References the PNFD of a constituent PNF.";
@@ -164,7 +164,7 @@ submodule etsi-nfv-ns { 
            leaf vnfd-id {

              mandatory true;

              type leafref {

                path "../../../../vnfd/id";

                path "/nfv:nfv/nfv:vnfd/nfv:id";

              }

              must "boolean(../../../vnfd-id[.=current()])";

            }
@@ -172,7 +172,7 @@ submodule etsi-nfv-ns { 
            leaf ext-cpd-id {

              mandatory true;

              type leafref {

                path "deref(../vnfd-id)/../ext-cpd/id";

                path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";

              }

            }

          }
@@ -181,7 +181,7 @@ submodule etsi-nfv-ns { 
            leaf pnfd-id {

              mandatory true;

              type leafref {

                path "../../../../pnfd/id";

                path "/nfv:nfv/nfv:pnfd/nfv:id";

              }

              must "boolean(../pnfd-id[.=current()])";

            }
@@ -189,7 +189,7 @@ submodule etsi-nfv-ns { 
            leaf ext-cpd-id {

              mandatory true;

              type leafref {

                path "deref(../pnfd-id)/../ext-cpd/id";

                path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";

              }

            }

          }
@@ -472,13 +472,12 @@ submodule etsi-nfv-ns { 
              must ". = deref(../../vnfd-profile-id)/../vnfd-id" {

              }

              type leafref {

                  path "../../../../../../vnfd/id";

                path "/nfv:nfv/nfv:vnfd/nfv:id";

              }

            }

            leaf cpd-id {

              type leafref {

                  path "deref(../vnfd-id)/../ext-cpd/id";

                }

                path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";

              }

            }

            container pnf {
@@ -489,10 +488,13 @@ submodule etsi-nfv-ns { 
                  path "../../../../../../pnfd/id";

                }

              }

              leaf pnf-cpd-id {

              type leafref {

                  path "deref(../pnfd-id)/../ext-cpd/id";

                path "/nfv:nfv/nfv:pnfd/nfv:id";

              }

            }

            leaf pnf-cpd-id {

              type leafref {

                path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";

              }

            }

            container ns {
@@ -637,6 +639,7 @@ submodule etsi-nfv-ns { 
    leaf-list autoscale-rule {

      type string;

    }



    list lifecycle-management-script {

      key "event";

      leaf event {
@@ -716,7 +719,7 @@ submodule etsi-nfv-ns { 
        leaf vnfd-id {

          mandatory true;

          type leafref {

            path "../../../../vnfd/id";

            path "/nfv:nfv/nfv:vnfd/nfv:id";

          }

          description

            "References a VNFD.";
@@ -728,7 +731,7 @@ submodule etsi-nfv-ns { 
        leaf flavour-id {

          mandatory true;

          type leafref {

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

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

          }

          description

            "Identifies a flavour within the VNFD.";
@@ -740,7 +743,8 @@ submodule etsi-nfv-ns { 
        leaf instantiation-level {

          mandatory true;

          type leafref {

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

            path "deref(../flavour-id)/../nfv:instantiation-level/" +

	         "nfv:id";

          }

          description

            "Identifier of the instantiation level of the VNF DF
@@ -840,7 +844,7 @@ submodule etsi-nfv-ns { 


            leaf constituent-cpd-id {

              type leafref {

                path "deref(../../../vnfd-id)/../ext-cpd/id";

                path "deref(../../../vnfd-id)/../nfv:ext-cpd/nfv:id";

              }

              description

                "A reference to the descriptor of a connection point
@@ -874,7 +878,7 @@ submodule etsi-nfv-ns { 


        leaf pnfd-id {

          type leafref {

            path "../../../../pnfd/id";

            path "/nfv:nfv/nfv:pnfd/nfv:id";

          }

          description

            "References a PNFD.";
@@ -930,7 +934,7 @@ submodule etsi-nfv-ns { 


            leaf constituent-cpd-id {

              type leafref {

                path "deref(../../../pnfd-id)/../ext-cpd/id";

                path "deref(../../../pnfd-id)/../nfv:ext-cpd/nfv:id";

              }

              description

                "A reference to the descriptor of a connection point
@@ -1501,7 +1505,7 @@ submodule etsi-nfv-ns { 
        container vnf-indicator-info {

          leaf vnfd-id {

            type leafref {

              path "../../../../../vnfd/id";

              path "/nfv:nfv/nfv:vnfd/nfv:id";

            }

            description

              "Identifies a VNFD.";
@@ -1513,7 +1517,7 @@ submodule etsi-nfv-ns { 
	  leaf vnf-indicator {

            mandatory true;

            type leafref {

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

              path "deref(../vnfd-id)/../nfv:indicator/nfv:id";

            }

            description

              "Identifies a VNF indicator within the VNFD.";

src/yang/etsi-nfv-nsd.yang

+0 −26
Original line number Diff line number Diff line
@@ -20,19 +20,6 @@ module etsi-nfv-nsd { 
  }



  container nsd {

    list vnfd {

      key "id";

      description

        "A VNF Descriptor (VNFD) is a deployment template which

         describes a VNF in terms of deployment and operational

         behaviour requirements. It also contains connectivity,

         interface and virtualised resource requirements";

      reference

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



      uses vnf:vnfd;

    }



    list nsd {

      key "id";

      max-elements 1;
@@ -45,18 +32,5 @@ module etsi-nfv-nsd { 
        "GS NFV-IFA014: Section 6.2.2, Network Service Descriptor

         information element";

    }



    list pnfd {

      key "id";



      description

	"The Pnfd information element is a deployment template

         enabling on-boarding PNFs and referencing them from an

         NSD. It focuses on connectivity aspects only.";

      reference

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



      uses vnf:pnfd;

    }

  }

}

src/yang/etsi-nfv-vnf.yang

+7 −7
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ submodule etsi-nfv-vnf { 


        leaf int-virtual-link-desc {

          type leafref {

            path "../../../int-virtual-link-desc/id";

            path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";

          }

          description

            "Reference of the internal VLD which this internal CPD
@@ -260,7 +260,7 @@ submodule etsi-nfv-vnf { 


        leaf nicio-requirements {

          type leafref {

            path "../../../virtual-compute-desc/id";

            path "/nfv:nfv/nfv:vnfd/nfv:virtual-compute-desc/nfv:id";

          }

          description

            "This references (couples) the CPD with any logical node I/O
@@ -1254,7 +1254,7 @@ submodule etsi-nfv-vnf { 
             Descriptor (CPD) connect. Either intVirtualLinkDesc or

             intCpd shall be present.";

          type leafref {

            path "../../int-virtual-link-desc/id";

            path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";

          }

        }
@@ -1292,7 +1292,7 @@ submodule etsi-nfv-vnf { 


      leaf nicio-requirements {

        type leafref {

          path "../../virtual-compute-desc/id";

          path "/nfv:nfv/nfv:vnfd/nfv:virtual-compute-desc/nfv:id";

        }

        description

          "This references (couples) the CPD with any logical node I/O
@@ -1472,7 +1472,7 @@ submodule etsi-nfv-vnf { 


        leaf id {

          type leafref {

            path "../../../int-virtual-link-desc/id";

            path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";

          }

          description

            "Uniquely identifies a Vnf VLD.";
@@ -1484,7 +1484,7 @@ submodule etsi-nfv-vnf { 
        leaf flavour {

          type leafref {

            path "deref(../../../ext-cpd/int-virtual-link-desc)" +

                 "/../flavour/id";

                 "/../nfv:flavour/nfv:id";

          }

          description

            "Identifies a flavour within the VnfVirtualLinkDesc.";
@@ -2824,7 +2824,7 @@ submodule etsi-nfv-vnf { 


      leaf-list virtual-link-desc {

        type leafref {

          path "../../int-virtual-link-desc/id";

          path "/nfv:nfv/nfv:vnfd/nfv:int-virtual-link-desc/nfv:id";

        }

        description

          "References to VnfVirtualLinkDesc that are part of this