Skip to content

S
SOL006
Commit 6ee6373f authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files
Options

Fix for bug#95

parent 1e9c93d1
Pipeline #213 passed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 152 additions and 53 deletions
    example-data/nfv.xml
    View file @ 6ee6373f
    ......@@ -298,11 +298,17 @@
    <max-number-of-instances>1</max-number-of-instances>
    <virtual-link-connectivity>
    <virtual-link-profile-id>mgmt</virtual-link-profile-id>
    <cpd-id>management</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>firewall</constituent-base-element-id>
    <constituent-cpd-id>management</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    <virtual-link-connectivity>
    <virtual-link-profile-id>r2fw</virtual-link-profile-id>
    <cpd-id>outside</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>firewall</constituent-base-element-id>
    <constituent-cpd-id>outside</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    </vnf-profile>
    <vnf-profile>
    ......@@ -314,11 +320,17 @@
    <max-number-of-instances>1</max-number-of-instances>
    <virtual-link-connectivity>
    <virtual-link-profile-id>mgmt</virtual-link-profile-id>
    <cpd-id>management</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>router</constituent-base-element-id>
    <constituent-cpd-id>management</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    <virtual-link-connectivity>
    <virtual-link-profile-id>r2fw</virtual-link-profile-id>
    <cpd-id>right</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>router</constituent-base-element-id>
    <constituent-cpd-id>right</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    </vnf-profile>
    <virtual-link-profile>
    ......@@ -367,15 +379,24 @@
    <max-number-of-instances>1</max-number-of-instances>
    <virtual-link-connectivity>
    <virtual-link-profile-id>fw2dpi</virtual-link-profile-id>
    <cpd-id>inside</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>firewall</constituent-base-element-id>
    <constituent-cpd-id>inside</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    <virtual-link-connectivity>
    <virtual-link-profile-id>mgmt</virtual-link-profile-id>
    <cpd-id>management</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>firewall</constituent-base-element-id>
    <constituent-cpd-id>management</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    <virtual-link-connectivity>
    <virtual-link-profile-id>r2fw</virtual-link-profile-id>
    <cpd-id>outside</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>firewall</constituent-base-element-id>
    <constituent-cpd-id>outside</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    </vnf-profile>
    <vnf-profile>
    ......@@ -387,11 +408,17 @@
    <max-number-of-instances>1</max-number-of-instances>
    <virtual-link-connectivity>
    <virtual-link-profile-id>mgmt</virtual-link-profile-id>
    <cpd-id>management</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>router</constituent-base-element-id>
    <constituent-cpd-id>management</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    <virtual-link-connectivity>
    <virtual-link-profile-id>r2fw</virtual-link-profile-id>
    <cpd-id>right</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>router</constituent-base-element-id>
    <constituent-cpd-id>right</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    </vnf-profile>
    <pnf-profile>
    ......@@ -399,7 +426,10 @@
    <pnfd-id>physical-dpi</pnfd-id>
    <virtual-link-connectivity>
    <virtual-link-profile-id>fw2dpi</virtual-link-profile-id>
    <cpd-id>outside</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>physical-dpi</constituent-base-element-id>
    <constituent-cpd-id>outside</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    </pnf-profile>
    <virtual-link-profile>
    ......@@ -494,7 +524,10 @@
    <max-number-of-instances>1</max-number-of-instances>
    <virtual-link-connectivity>
    <virtual-link-profile-id>r2fw</virtual-link-profile-id>
    <cpd-id>right</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>router</constituent-base-element-id>
    <constituent-cpd-id>right</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    </vnf-profile>
    <virtual-link-profile>
    ......@@ -528,7 +561,10 @@
    <max-number-of-instances>1</max-number-of-instances>
    <virtual-link-connectivity>
    <virtual-link-profile-id>r2fw</virtual-link-profile-id>
    <cpd-id>outside</cpd-id>
    <constituent-cpd-id>
    <constituent-base-element-id>firewall</constituent-base-element-id>
    <constituent-cpd-id>outside</constituent-cpd-id>
    </constituent-cpd-id>
    </virtual-link-connectivity>
    </ns-profile>
    </df>
    ......
    src/yang/etsi-nfv-ns.yang
    View file @ 6ee6373f
    ......@@ -805,18 +805,41 @@ submodule etsi-nfv-ns {
    information element.";
    }
    leaf-list cpd-id {
    type leafref {
    path "deref(../../vnfd-id)/../ext-cpd/id";
    }
    list constituent-cpd-id {
    key "constituent-base-element-id";
    description
    "References the descriptor of a connection point on a
    VNF/PNF or a SAP which connects to virtual links
    instantiated from the profile identified in the
    virtualLinkProfileId attribute.";
    "Describes a connection point on a VNF/PNF or a SAP
    which connects to virtual links instantiated from
    the profile identified in the virtualLinkProfileId
    attribute.";
    reference
    "GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
    information element.";
    "GS NFV IFA014: Section 6.3.7
    NsVirtualLinkConnectivity information element";
    leaf constituent-base-element-id {
    type leafref {
    path "../../../id";
    }
    description
    "Reference to the profile of an NS constituent.";
    reference
    "GS NFV IFA014: Section 6.4.8
    CpdInConstituentElement information element";
    }
    leaf constituent-cpd-id {
    type leafref {
    path "deref(../../../vnfd-id)/../nfv:ext-cpd/nfv:id";
    }
    description
    "A reference to the descriptor of a connection point
    attached to one of the constituent VNFs and PNFs or to
    the descriptor of a NS SAP.";
    reference
    "GS NFV IFA014: Section 6.4.4.2 CpdPool information
    element";
    }
    }
    }
    }
    ......@@ -872,18 +895,41 @@ submodule etsi-nfv-ns {
    information element.";
    }
    leaf-list cpd-id {
    type leafref {
    path "deref(../../pnfd-id)/../ext-cpd/id";
    }
    list constituent-cpd-id {
    key "constituent-base-element-id";
    description
    "References the descriptor of a connection point on a
    VNF/PNF or a SAP which connects to virtual links
    instantiated from the profile identified in the
    virtualLinkProfileId attribute.";
    "Describes a connection point on a VNF/PNF or a SAP
    which connects to virtual links instantiated from
    the profile identified in the virtualLinkProfileId
    attribute.";
    reference
    "GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
    information element.";
    "GS NFV IFA014: Section 6.3.7
    NsVirtualLinkConnectivity information element";
    leaf constituent-base-element-id {
    type leafref {
    path "../../../id";
    }
    description
    "Reference to the profile of an NS constituent.";
    reference
    "GS NFV IFA014: Section 6.4.8
    CpdInConstituentElement information element";
    }
    leaf constituent-cpd-id {
    type leafref {
    path "deref(../../../pnfd-id)/../nfv:ext-cpd/nfv:id";
    }
    description
    "A reference to the descriptor of a connection point
    attached to one of the constituent VNFs and PNFs or to
    the descriptor of a NS SAP.";
    reference
    "GS NFV IFA014: Section 6.4.4.2 CpdPool information
    element";
    }
    }
    }
    }
    ......@@ -1338,28 +1384,45 @@ submodule etsi-nfv-ns {
    "GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
    information element.";
    }
    leaf-list cpd-id {
    type leafref {
    path "deref(../../nsd-id)/../sapd/id";
    }
    description
    "References the descriptor of a connection point on a
    VNF/PNF or a SAP which connects to virtual links
    instantiated from the profile identified in the
    virtualLinkProfileId attribute.";
    list constituent-cpd-id {
    key "constituent-base-element-id";
    description
    "Describes a connection point on a VNF/PNF or a SAP
    which connects to virtual links instantiated from
    the profile identified in the virtualLinkProfileId
    attribute.";
    reference
    "GS NFV IFA014: Section 6.3.7.2, NsVirutalLinkConnectivity
    information element.";
    }
    description
    "Defines the connection information of the NS, it
    contains connection relationship between an NS SAP and
    a NS virtual Link of the composite NS.";
    reference
    "GS NFV IFA014: Section 6.3.11.2 NsProfile information
    element";
    }
    }
    "GS NFV IFA014: Section 6.3.7
    NsVirtualLinkConnectivity information element";
    leaf constituent-base-element-id {
    type leafref {
    path "../../../id";
    }
    description
    "Reference to the profile of an NS constituent.";
    reference
    "GS NFV IFA014: Section 6.4.8
    CpdInConstituentElement information element";
    }
    leaf constituent-cpd-id {
    type leafref {
    path "deref(../../../nsd-id)/../nfv:sapd/nfv:id";
    }
    description
    "A reference to the descriptor of a connection point
    attached to one of the constituent VNFs and PNFs or to
    the descriptor of a NS SAP.";
    reference
    "GS NFV IFA014: Section 6.4.4.2 CpdPool information
    element";
    }
    }
    }
    }
    list dependencies {
    key "id";
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment