Commit 7b7acc58 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Addressing changes from NFVIFA(19)000513r2

parent c1f567b3
Pipeline #1102 passed with stage
in 0 seconds
...@@ -415,57 +415,7 @@ submodule etsi-nfv-ns { ...@@ -415,57 +415,7 @@ submodule etsi-nfv-ns {
element"; element";
} }
leaf-list nfp-position-element-id { list nfp-position-element {
type leafref {
path "../nfpd/position-desc/element/id";
}
description
"References NfpPositionElement associated with one of the
constituent VNF Profile, PNF Profile or NS Profile of a
nested NS.";
reference
"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
element";
}
list nfpd {
key "id";
leaf id {
type string;
description
"Identifies this nfpd information element within a
VNFFGD.";
reference
"GS NFV IFA014: Section 6.4.3.2 Nfpd information
element";
}
leaf rule {
type string;
description
"Provides an NFP classification and selection rule.
The rule may be expressed as a criteria constructed out
of atomic assertions linked by Boolean operators AND,
OR and NOT.";
reference
"GS NFV IFA014: Section 6.4.3.2 Nfpd information
element";
}
list position-desc {
key "id";
leaf id {
type string;
description
"Identifier of this NfpPositionDesc element.";
reference
"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
information element";
}
list element {
key "id"; key "id";
leaf id { leaf id {
...@@ -487,7 +437,7 @@ submodule etsi-nfv-ns { ...@@ -487,7 +437,7 @@ submodule etsi-nfv-ns {
must ". = deref(../../vnfd-profile-id)" { must ". = deref(../../vnfd-profile-id)" {
} }
type leafref { type leafref {
path "../../../../../../../../nsd/df/vnf-profile/id"; path "../../../../../../nsd/df/vnf-profile/id";
} }
} }
} }
...@@ -496,7 +446,7 @@ submodule etsi-nfv-ns { ...@@ -496,7 +446,7 @@ submodule etsi-nfv-ns {
must ". = deref(../../pnfd-profile-id)" { must ". = deref(../../pnfd-profile-id)" {
} }
type leafref { type leafref {
path "../../../../../../../../nsd/df/pnf-profile/id"; path "../../../../../../nsd/df/pnf-profile/id";
} }
} }
} }
...@@ -505,7 +455,7 @@ submodule etsi-nfv-ns { ...@@ -505,7 +455,7 @@ submodule etsi-nfv-ns {
must ". = deref(../../ns-profile-id)" { must ". = deref(../../ns-profile-id)" {
} }
type leafref { type leafref {
path "../../../../../../../../nsd/df/ns-profile/id"; path "../../../../../../nsd/df/ns-profile/id";
} }
} }
} }
...@@ -522,7 +472,7 @@ submodule etsi-nfv-ns { ...@@ -522,7 +472,7 @@ submodule etsi-nfv-ns {
must ". = deref(../../vnfd-profile-id)/../vnfd-id" { must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
} }
type leafref { type leafref {
path "../../../../../../../../vnfd/id"; path "../../../../../../vnfd/id";
} }
} }
leaf cpd-id { leaf cpd-id {
...@@ -536,7 +486,7 @@ submodule etsi-nfv-ns { ...@@ -536,7 +486,7 @@ submodule etsi-nfv-ns {
must ". = deref(../../pnfd-profile-id)/../pnfd-id" { must ". = deref(../../pnfd-profile-id)/../pnfd-id" {
} }
type leafref { type leafref {
path "../../../../../../../../pnfd/id"; path "../../../../../../pnfd/id";
} }
} }
leaf pnf-cpd-id { leaf pnf-cpd-id {
...@@ -552,7 +502,7 @@ submodule etsi-nfv-ns { ...@@ -552,7 +502,7 @@ submodule etsi-nfv-ns {
} }
type leafref { type leafref {
path "../../../../../../../../nsd/id"; path "../../../../../../nsd/id";
} }
} }
leaf sap-cpd-id { leaf sap-cpd-id {
...@@ -586,6 +536,56 @@ submodule etsi-nfv-ns { ...@@ -586,6 +536,56 @@ submodule etsi-nfv-ns {
information element"; information element";
} }
list nfpd {
key "id";
leaf id {
type string;
description
"Identifies this nfpd information element within a
VNFFGD.";
reference
"GS NFV IFA014: Section 6.4.3.2 Nfpd information
element";
}
leaf rule {
type string;
description
"Provides an NFP classification and selection rule.
The rule may be expressed as a criteria constructed out
of atomic assertions linked by Boolean operators AND,
OR and NOT.";
reference
"GS NFV IFA014: Section 6.4.3.2 Nfpd information
element";
}
list position-desc {
key "id";
leaf id {
type string;
description
"Identifier of this NfpPositionDesc element.";
reference
"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
information element";
}
leaf-list nfp-position-element-id {
type leafref {
path "../../../nfp-position-element/id";
}
description
"References NfpPositionElement associated with one of the
constituent VNF Profile, PNF Profile or NS Profile of a
nested NS.";
reference
"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
element";
}
leaf forwarding-behaviour { leaf forwarding-behaviour {
type identityref { type identityref {
base forwarding-behaviour; base forwarding-behaviour;
......
Supports Markdown
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