Commit c570c31b authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Changes to address bug#88

parent 85681425
Pipeline #181 passed with stage
in 0 seconds
This diff is collapsed.
...@@ -10,7 +10,6 @@ cd src ...@@ -10,7 +10,6 @@ cd src
echo "Testing compilation" echo "Testing compilation"
CONFD_OPTS="--fail-on-warnings" CONFD_OPTS="--fail-on-warnings"
CONFD_OPTS="" CONFD_OPTS=""
confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-common.fxs etsi-nfv-common.yang
confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv.fxs etsi-nfv.yang confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv.fxs etsi-nfv.yang
echo "Starting ConfD" echo "Starting ConfD"
......
module etsi-nfv-common { submodule etsi-nfv-common {
namespace "urn:etsi:params:xml:ns:yang:etsi-nfv-common";
yang-version 1.1; yang-version 1.1;
prefix common; belongs-to etsi-nfv {
prefix nfv;
}
description description
"Common data types for ETSI data models."; "Common data types for ETSI data models.";
...@@ -41,13 +41,13 @@ module etsi-nfv-common { ...@@ -41,13 +41,13 @@ module etsi-nfv-common {
identity address-type { identity address-type {
description description
"Describes the type of the address to be assigned to the CP "Describes the type of the address to be assigned to the CP
instantiated from the parent CPD. instantiated from the parent CPD.
Value: Value:
• MAC address. • MAC address.
• IP address. • IP address.
• … • …
The content type shall be aligned with the address type The content type shall be aligned with the address type
supported by the layerProtocol attribute of the parent CPD."; supported by the layerProtocol attribute of the parent CPD.";
reference reference
"GS NFV IFA011: Section 7.1.3.3, AddressData information "GS NFV IFA011: Section 7.1.3.3, AddressData information
...@@ -180,7 +180,7 @@ module etsi-nfv-common { ...@@ -180,7 +180,7 @@ module etsi-nfv-common {
/* /*
* Typedefs * Typedefs
*/ */
typedef flow-pattern { typedef flow-pattern {
type enumeration { type enumeration {
enum line; enum line;
...@@ -395,7 +395,7 @@ module etsi-nfv-common { ...@@ -395,7 +395,7 @@ module etsi-nfv-common {
leaf layer-protocol { leaf layer-protocol {
mandatory true; mandatory true;
type identityref { type identityref {
base common:layer-protocol; base layer-protocol;
} }
description description
"Identifies a protocol that the connection points "Identifies a protocol that the connection points
...@@ -406,7 +406,7 @@ module etsi-nfv-common { ...@@ -406,7 +406,7 @@ module etsi-nfv-common {
} }
leaf role { leaf role {
type identityref { type identityref {
base common:cp-role; base cp-role;
} }
description description
"Identifies the role of the connection points "Identifies the role of the connection points
......
...@@ -7,9 +7,7 @@ submodule etsi-nfv-pnf { ...@@ -7,9 +7,7 @@ submodule etsi-nfv-pnf {
/* /*
* Import * Import
*/ */
import etsi-nfv-common { include etsi-nfv-common;
prefix common;
}
description description
"Models for PNFD according to GS NFV-IFA 014."; "Models for PNFD according to GS NFV-IFA 014.";
...@@ -83,7 +81,7 @@ submodule etsi-nfv-pnf { ...@@ -83,7 +81,7 @@ submodule etsi-nfv-pnf {
} }
list ext-cpd { list ext-cpd {
key "id"; key "id";
uses common:cpd; uses cpd;
description description
"Specifies the characteristics of one or more connection "Specifies the characteristics of one or more connection
points where to connect the PNF to a VL."; points where to connect the PNF to a VL.";
...@@ -92,7 +90,7 @@ submodule etsi-nfv-pnf { ...@@ -92,7 +90,7 @@ submodule etsi-nfv-pnf {
} }
list security { list security {
key "signature"; key "signature";
uses common:security-parameters; uses security-parameters;
description description
"Provides a signature to prevent tampering. "Provides a signature to prevent tampering.
Editor's Note: While IFA014 does specify that the PNFD Editor's Note: While IFA014 does specify that the PNFD
......
...@@ -4,15 +4,14 @@ submodule etsi-nfv-vnf { ...@@ -4,15 +4,14 @@ submodule etsi-nfv-vnf {
prefix nfv; prefix nfv;
} }
include etsi-nfv-common;
import ietf-inet-types { import ietf-inet-types {
prefix inet; prefix inet;
} }
import ietf-yang-types { import ietf-yang-types {
prefix yang; prefix yang;
} }
import etsi-nfv-common {
prefix common;
}
description description
"Models for VNFD according to GS NFV-IFA 011."; "Models for VNFD according to GS NFV-IFA 011.";
...@@ -81,16 +80,15 @@ submodule etsi-nfv-vnf { ...@@ -81,16 +80,15 @@ submodule etsi-nfv-vnf {
"GS NFV-IFA011: Section 7.1.6.6, "GS NFV-IFA011: Section 7.1.6.6,
VirtualNetworkInterfaceRequirements information element"; VirtualNetworkInterfaceRequirements information element";
} }
leaf niclo-requirements { leaf niclo-requirements {
type leafref { type leafref {
path "/nfv/vnfd/virtual-compute-descriptor/id"; path "/nfv/vnfd/virtual-compute-descriptor/id";
} }
description description
"This references (couples) the CPD with any logical node "This references (couples) the CPD with any logical node I/O
I/O requirements (for network devices) that may have been requirements (for network devices) that may have been
created. Linking these attributes is necessary so that created. Linking these attributes is necessary so that so
I/O requirements that need to be articulated at the that I/O requirements that need to be articulated at the
logical node level can be associated with the network logical node level can be associated with the network
interface requirements associated with the CPD."; interface requirements associated with the CPD.";
reference reference
...@@ -104,7 +102,7 @@ submodule etsi-nfv-vnf { ...@@ -104,7 +102,7 @@ submodule etsi-nfv-vnf {
// IFA011. A similar definition of Cpd exists in IFA014, but // IFA011. A similar definition of Cpd exists in IFA014, but
// that is for use with Sapd and Pnfd. Do not use this grouping // that is for use with Sapd and Pnfd. Do not use this grouping
// for that. // for that.
grouping cpd { grouping vnf-cpd {
description description
"A Cpd information element describes network "A Cpd information element describes network
connectivity to a compute resource or a VL."; connectivity to a compute resource or a VL.";
...@@ -121,7 +119,7 @@ submodule etsi-nfv-vnf { ...@@ -121,7 +119,7 @@ submodule etsi-nfv-vnf {
leaf layer-protocol { leaf layer-protocol {
mandatory true; mandatory true;
type identityref { type identityref {
base common:layer-protocol; base layer-protocol;
} }
description description
"Identifies which protocol the CP uses for connectivity "Identifies which protocol the CP uses for connectivity
...@@ -132,7 +130,7 @@ submodule etsi-nfv-vnf { ...@@ -132,7 +130,7 @@ submodule etsi-nfv-vnf {
} }
leaf role { leaf role {
type identityref { type identityref {
base common:cp-role; base cp-role;
} }
description description
"Identifies the role of the port in the context of the "Identifies the role of the port in the context of the
...@@ -159,7 +157,7 @@ submodule etsi-nfv-vnf { ...@@ -159,7 +157,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.3, Cpd information element."; "GS NFV IFA011: Section 7.1.6.3, Cpd information element.";
leaf associated-layer-protocol { leaf associated-layer-protocol {
type identityref { type identityref {
base common:layer-protocol; base layer-protocol;
} }
description description
"One of the values of the attribute layerProtocol of the Cpd "One of the values of the attribute layerProtocol of the Cpd
...@@ -173,7 +171,7 @@ submodule etsi-nfv-vnf { ...@@ -173,7 +171,7 @@ submodule etsi-nfv-vnf {
key "address-type"; key "address-type";
leaf address-type { leaf address-type {
type identityref { type identityref {
base common:address-type; base address-type;
} }
description description
"Describes the type of the address to be assigned to the CP "Describes the type of the address to be assigned to the CP
...@@ -254,7 +252,7 @@ submodule etsi-nfv-vnf { ...@@ -254,7 +252,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.3, Cpd information element."; "GS NFV IFA011: Section 7.1.6.3, Cpd information element.";
} }
} }
grouping vnfd { grouping vnfd {
list vnfd { list vnfd {
key "id"; key "id";
...@@ -450,7 +448,7 @@ submodule etsi-nfv-vnf { ...@@ -450,7 +448,7 @@ submodule etsi-nfv-vnf {
element."; element.";
} }
uses cpd; uses vnf-cpd;
} }
leaf virtual-compute-desc { leaf virtual-compute-desc {
type leafref { type leafref {
...@@ -541,7 +539,7 @@ submodule etsi-nfv-vnf { ...@@ -541,7 +539,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter "GS NFV IFA011: Section 7.1.11.3, MonitoringParameter
information element."; information element.";
} }
uses common:monitoring-parameter; uses monitoring-parameter;
} }
list configurable-properties { list configurable-properties {
key "key"; key "key";
...@@ -677,7 +675,7 @@ submodule etsi-nfv-vnf { ...@@ -677,7 +675,7 @@ submodule etsi-nfv-vnf {
"Identifies the preferred version of the requested "Identifies the preferred version of the requested
additional capability."; additional capability.";
reference reference
"GS NFV IFA011: Section 7.1.9.5, "GS NFV IFA011: Section 7.1.9.5,
RequestedAdditionalCapabilityData Information RequestedAdditionalCapabilityData Information
element."; element.";
} }
...@@ -690,10 +688,10 @@ submodule etsi-nfv-vnf { ...@@ -690,10 +688,10 @@ submodule etsi-nfv-vnf {
type string; type string;
} }
description description
"Identifies specific attributes, dependent on the "Identifies specific attributes, dependent on the
requested additional capability type."; requested additional capability type.";
reference reference
"GS NFV IFA011: Section 7.1.9.5, "GS NFV IFA011: Section 7.1.9.5,
RequestedAdditionalCapabilityData Information RequestedAdditionalCapabilityData Information
element."; element.";
} }
...@@ -1225,7 +1223,7 @@ submodule etsi-nfv-vnf { ...@@ -1225,7 +1223,7 @@ submodule etsi-nfv-vnf {
} }
} }
uses common:connectivity-type; uses connectivity-type;
leaf-list test-access { leaf-list test-access {
type string; type string;
...@@ -1256,7 +1254,7 @@ submodule etsi-nfv-vnf { ...@@ -1256,7 +1254,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter "GS NFV IFA011: Section 7.1.11.3, MonitoringParameter
information element."; information element.";
} }
uses common:monitoring-parameter; uses monitoring-parameter;
} }
} }
...@@ -1286,7 +1284,7 @@ submodule etsi-nfv-vnf { ...@@ -1286,7 +1284,7 @@ submodule etsi-nfv-vnf {
ext-CP to the VDU's CP. ext-CP to the VDU's CP.
*/ */
uses virtual-network-interface-requirements; uses virtual-network-interface-requirements;
uses cpd; uses vnf-cpd;
} }
list df { list df {
...@@ -1350,7 +1348,7 @@ submodule etsi-nfv-vnf { ...@@ -1350,7 +1348,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.3, VduProfile information "GS NFV IFA011: Section 7.1.8.3, VduProfile information
element."; element.";
} }
uses common:local-affinity-or-anti-affinity-rule; uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { list affinity-or-anti-affinity-group {
key "id"; key "id";
description description
...@@ -1385,7 +1383,7 @@ submodule etsi-nfv-vnf { ...@@ -1385,7 +1383,7 @@ submodule etsi-nfv-vnf {
information element."; information element.";
} }
leaf scope { leaf scope {
type common:affinity-scope; type affinity-scope;
description description
"Specifies the scope of the rule, possible values are "Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'"; 'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'";
...@@ -1425,7 +1423,7 @@ submodule etsi-nfv-vnf { ...@@ -1425,7 +1423,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile "GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile
information element."; information element.";
} }
uses common:local-affinity-or-anti-affinity-rule; uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { list affinity-or-anti-affinity-group {
key "id"; key "id";
leaf id { leaf id {
...@@ -1519,7 +1517,7 @@ submodule etsi-nfv-vnf { ...@@ -1519,7 +1517,7 @@ submodule etsi-nfv-vnf {
description description
"The InstantiationLevel information element describes a "The InstantiationLevel information element describes a
given level of resources to be instantiated within a given level of resources to be instantiated within a
DF in term of the number of VNFC instances to be DF in term of the number of VNFC instances to be
created from each VDU."; created from each VDU.";
reference reference
"GS NFV IFA011: Section 7.1.8.7 InstantiationLevel "GS NFV IFA011: Section 7.1.8.7 InstantiationLevel
...@@ -1559,7 +1557,7 @@ submodule etsi-nfv-vnf { ...@@ -1559,7 +1557,7 @@ submodule etsi-nfv-vnf {
} }
leaf-list supported-operation { leaf-list supported-operation {
type identityref { type identityref {
base common:supported-operation; base supported-operation;
} }
description description
"Indicates which operations are available for this DF via "Indicates which operations are available for this DF via
...@@ -1717,7 +1715,7 @@ submodule etsi-nfv-vnf { ...@@ -1717,7 +1715,7 @@ submodule etsi-nfv-vnf {
} }
container operate-vnf-op-config { container operate-vnf-op-config {
description description
"This information element defines attributes that "This information element defines attributes that
affect the invocation of the OperateVnf operation."; affect the invocation of the OperateVnf operation.";
reference reference
"GS NFV IFA011: Section 7.1.5.2 "GS NFV IFA011: Section 7.1.5.2
...@@ -1735,7 +1733,7 @@ submodule etsi-nfv-vnf { ...@@ -1735,7 +1733,7 @@ submodule etsi-nfv-vnf {
leaf max-recommended-graceful-stop-timeout { leaf max-recommended-graceful-stop-timeout {
type yang:timeticks; type yang:timeticks;
description description
"Maximum recommended timeout value that can be "Maximum recommended timeout value that can be
needed to gracefully stop a VNF instance of a needed to gracefully stop a VNF instance of a
particular type under certain conditions, such as particular type under certain conditions, such as
maximum load condition. This is provided by VNF maximum load condition. This is provided by VNF
...@@ -1782,7 +1780,7 @@ submodule etsi-nfv-vnf { ...@@ -1782,7 +1780,7 @@ submodule etsi-nfv-vnf {
leaf type { leaf type {
mandatory true; mandatory true;
type common:affinity-type; type affinity-type;
description description
"Specifies whether the rule is an affinity rule or an "Specifies whether the rule is an affinity rule or an
anti-affinity rule."; anti-affinity rule.";
...@@ -1793,7 +1791,7 @@ submodule etsi-nfv-vnf { ...@@ -1793,7 +1791,7 @@ submodule etsi-nfv-vnf {
leaf scope { leaf scope {
mandatory true; mandatory true;
type common:affinity-scope; type affinity-scope;
description description
"Specifies the scope of the rule, possible values are "Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'."; 'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
...@@ -1820,7 +1818,7 @@ submodule etsi-nfv-vnf { ...@@ -1820,7 +1818,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3 MonitoringParameter "GS NFV IFA011: Section 7.1.11.3 MonitoringParameter
information element"; information element";
} }
uses common:monitoring-parameter; uses monitoring-parameter;
} }
list scaling-aspect { list scaling-aspect {
...@@ -2094,7 +2092,7 @@ submodule etsi-nfv-vnf { ...@@ -2094,7 +2092,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.2 VNFD information element"; "GS NFV IFA011: Section 7.1.2 VNFD information element";
leaf event { leaf event {
type common:internal-lifecycle-management-script-event; type internal-lifecycle-management-script-event;
description description
"Describes VNF lifecycle event(s) or an external stimulus "Describes VNF lifecycle event(s) or an external stimulus
detected on a VNFM reference point."; detected on a VNFM reference point.";
......
...@@ -3,9 +3,10 @@ module etsi-nfv { ...@@ -3,9 +3,10 @@ module etsi-nfv {
namespace "urn:etsi:params:xml:ns:yang:etsi-nfv"; namespace "urn:etsi:params:xml:ns:yang:etsi-nfv";
prefix nfv; prefix nfv;
include etsi-nfv-common;
include etsi-nfv-ns;
include etsi-nfv-vnf; include etsi-nfv-vnf;
include etsi-nfv-pnf; include etsi-nfv-pnf;
include etsi-nfv-ns;
organization organization
"European Telecommunications Standards Institute (ETSI)"; "European Telecommunications Standards Institute (ETSI)";
......
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