Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
NFV - Network Functions Virtualisation
SOL006
Commits
c570c31b
Commit
c570c31b
authored
Dec 19, 2018
by
Mahesh Jethanandani
Browse files
Changes to address bug#88
parent
85681425
Pipeline
#181
passed with stage
in 0 seconds
Changes
6
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
example-data/nfv.xml
View file @
c570c31b
This diff is collapsed.
Click to expand it.
run-test.sh
View file @
c570c31b
...
...
@@ -10,7 +10,6 @@ cd src
echo
"Testing compilation"
CONFD_OPTS
=
"--fail-on-warnings"
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
echo
"Starting ConfD"
...
...
src/yang/etsi-nfv-common.yang
View file @
c570c31b
module
etsi-nfv-common
{
namespace
"urn:etsi:params:xml:ns:yang:etsi-nfv-common"
;
submodule
etsi-nfv-common
{
yang-version
1.1
;
prefix
common
;
belongs-to
etsi-nfv
{
prefix
nfv
;
}
description
"Common data types for ETSI data models."
;
...
...
@@ -41,13 +41,13 @@ module etsi-nfv-common {
identity
address-type
{
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.
Value:
• MAC 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."
;
reference
"GS NFV IFA011: Section 7.1.3.3, AddressData information
...
...
@@ -180,7 +180,7 @@ module etsi-nfv-common {
/*
* Typedefs
*/
typedef
flow-pattern
{
type
enumeration
{
enum
line
;
...
...
@@ -395,7 +395,7 @@ module etsi-nfv-common {
leaf
layer-protocol
{
mandatory
true
;
type
identityref
{
base
common
:
layer-protocol
;
base
layer-protocol
;
}
description
"Identifies a protocol that the connection points
...
...
@@ -406,7 +406,7 @@ module etsi-nfv-common {
}
leaf
role
{
type
identityref
{
base
common
:
cp-role
;
base
cp-role
;
}
description
"Identifies the role of the connection points
...
...
src/yang/etsi-nfv-pnf.yang
View file @
c570c31b
...
...
@@ -7,9 +7,7 @@ submodule etsi-nfv-pnf {
/*
* Import
*/
import
etsi-nfv-common
{
prefix
common
;
}
include
etsi-nfv-common
;
description
"Models for PNFD according to GS NFV-IFA 014."
;
...
...
@@ -83,7 +81,7 @@ submodule etsi-nfv-pnf {
}
list
ext-cpd
{
key
"id"
;
uses
common
:
cpd
;
uses
cpd
;
description
"Specifies the characteristics of one or more connection
points where to connect the PNF to a VL."
;
...
...
@@ -92,7 +90,7 @@ submodule etsi-nfv-pnf {
}
list
security
{
key
"signature"
;
uses
common
:
security-parameters
;
uses
security-parameters
;
description
"Provides a signature to prevent tampering.
Editor's Note: While IFA014 does specify that the PNFD
...
...
src/yang/etsi-nfv-vnf.yang
View file @
c570c31b
...
...
@@ -4,15 +4,14 @@ submodule etsi-nfv-vnf {
prefix
nfv
;
}
include
etsi-nfv-common
;
import
ietf-inet-types
{
prefix
inet
;
}
import
ietf-yang-types
{
prefix
yang
;
}
import
etsi-nfv-common
{
prefix
common
;
}
description
"Models for VNFD according to GS NFV-IFA 011."
;
...
...
@@ -81,16 +80,15 @@ submodule etsi-nfv-vnf {
"GS NFV-IFA011: Section 7.1.6.6,
VirtualNetworkInterfaceRequirements information element"
;
}
leaf
niclo-requirements
{
type
leafref
{
path
"/nfv/vnfd/virtual-compute-descriptor/id"
;
}
description
"This references (couples) the CPD with any logical node
I/O
requirements (for network devices) that may have been
created. Linking these attributes is necessary so that
I/O requirements that need to be articulated at the
"This references (couples) the CPD with any logical node
I/O
requirements (for network devices) that may have been
created. Linking these attributes is necessary so that
so
that
I/O requirements that need to be articulated at the
logical node level can be associated with the network
interface requirements associated with the CPD."
;
reference
...
...
@@ -104,7 +102,7 @@ submodule etsi-nfv-vnf {
// IFA011. A similar definition of Cpd exists in IFA014, but
// that is for use with Sapd and Pnfd. Do not use this grouping
// for that.
grouping
cpd
{
grouping
vnf-
cpd
{
description
"A Cpd information element describes network
connectivity to a compute resource or a VL."
;
...
...
@@ -121,7 +119,7 @@ submodule etsi-nfv-vnf {
leaf
layer-protocol
{
mandatory
true
;
type
identityref
{
base
common
:
layer-protocol
;
base
layer-protocol
;
}
description
"Identifies which protocol the CP uses for connectivity
...
...
@@ -132,7 +130,7 @@ submodule etsi-nfv-vnf {
}
leaf
role
{
type
identityref
{
base
common
:
cp-role
;
base
cp-role
;
}
description
"Identifies the role of the port in the context of the
...
...
@@ -159,7 +157,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.3, Cpd information element."
;
leaf
associated-layer-protocol
{
type
identityref
{
base
common
:
layer-protocol
;
base
layer-protocol
;
}
description
"One of the values of the attribute layerProtocol of the Cpd
...
...
@@ -173,7 +171,7 @@ submodule etsi-nfv-vnf {
key
"address-type"
;
leaf
address-type
{
type
identityref
{
base
common
:
address-type
;
base
address-type
;
}
description
"Describes the type of the address to be assigned to the CP
...
...
@@ -254,7 +252,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.3, Cpd information element."
;
}
}
grouping
vnfd
{
list
vnfd
{
key
"id"
;
...
...
@@ -450,7 +448,7 @@ submodule etsi-nfv-vnf {
element."
;
}
uses
cpd
;
uses
vnf-
cpd
;
}
leaf
virtual-compute-desc
{
type
leafref
{
...
...
@@ -541,7 +539,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter
information element."
;
}
uses
common
:
monitoring-parameter
;
uses
monitoring-parameter
;
}
list
configurable-properties
{
key
"key"
;
...
...
@@ -677,7 +675,7 @@ submodule etsi-nfv-vnf {
"Identifies the preferred version of the requested
additional capability."
;
reference
"GS NFV IFA011: Section 7.1.9.5,
"GS NFV IFA011: Section 7.1.9.5,
RequestedAdditionalCapabilityData Information
element."
;
}
...
...
@@ -690,10 +688,10 @@ submodule etsi-nfv-vnf {
type
string
;
}
description
"Identifies specific attributes, dependent on the
"Identifies specific attributes, dependent on the
requested additional capability type."
;
reference
"GS NFV IFA011: Section 7.1.9.5,
"GS NFV IFA011: Section 7.1.9.5,
RequestedAdditionalCapabilityData Information
element."
;
}
...
...
@@ -1225,7 +1223,7 @@ submodule etsi-nfv-vnf {
}
}
uses
common
:
connectivity-type
;
uses
connectivity-type
;
leaf-list
test-access
{
type
string
;
...
...
@@ -1256,7 +1254,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter
information element."
;
}
uses
common
:
monitoring-parameter
;
uses
monitoring-parameter
;
}
}
...
...
@@ -1286,7 +1284,7 @@ submodule etsi-nfv-vnf {
ext-CP to the VDU's CP.
*/
uses
virtual-network-interface-requirements
;
uses
cpd
;
uses
vnf-
cpd
;
}
list
df
{
...
...
@@ -1350,7 +1348,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.3, VduProfile information
element."
;
}
uses
common
:
local-affinity-or-anti-affinity-rule
;
uses
local-affinity-or-anti-affinity-rule
;
list
affinity-or-anti-affinity-group
{
key
"id"
;
description
...
...
@@ -1385,7 +1383,7 @@ submodule etsi-nfv-vnf {
information element."
;
}
leaf
scope
{
type
common
:
affinity-scope
;
type
affinity-scope
;
description
"Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'"
;
...
...
@@ -1425,7 +1423,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile
information element."
;
}
uses
common
:
local-affinity-or-anti-affinity-rule
;
uses
local-affinity-or-anti-affinity-rule
;
list
affinity-or-anti-affinity-group
{
key
"id"
;
leaf
id
{
...
...
@@ -1519,7 +1517,7 @@ submodule etsi-nfv-vnf {
description
"The InstantiationLevel information element describes 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."
;
reference
"GS NFV IFA011: Section 7.1.8.7 InstantiationLevel
...
...
@@ -1559,7 +1557,7 @@ submodule etsi-nfv-vnf {
}
leaf-list
supported-operation
{
type
identityref
{
base
common
:
supported-operation
;
base
supported-operation
;
}
description
"Indicates which operations are available for this DF via
...
...
@@ -1717,7 +1715,7 @@ submodule etsi-nfv-vnf {
}
container
operate-vnf-op-config
{
description
"This information element defines attributes that
"This information element defines attributes that
affect the invocation of the OperateVnf operation."
;
reference
"GS NFV IFA011: Section 7.1.5.2
...
...
@@ -1735,7 +1733,7 @@ submodule etsi-nfv-vnf {
leaf
max-recommended-graceful-stop-timeout
{
type
yang
:
timeticks
;
description
"Maximum recommended timeout value that can be
"Maximum recommended timeout value that can be
needed to gracefully stop a VNF instance of a
particular type under certain conditions, such as
maximum load condition. This is provided by VNF
...
...
@@ -1782,7 +1780,7 @@ submodule etsi-nfv-vnf {
leaf
type
{
mandatory
true
;
type
common
:
affinity-type
;
type
affinity-type
;
description
"Specifies whether the rule is an affinity rule or an
anti-affinity rule."
;
...
...
@@ -1793,7 +1791,7 @@ submodule etsi-nfv-vnf {
leaf
scope
{
mandatory
true
;
type
common
:
affinity-scope
;
type
affinity-scope
;
description
"Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'."
;
...
...
@@ -1820,7 +1818,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3 MonitoringParameter
information element"
;
}
uses
common
:
monitoring-parameter
;
uses
monitoring-parameter
;
}
list
scaling-aspect
{
...
...
@@ -2094,7 +2092,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.2 VNFD information element"
;
leaf
event
{
type
common
:
internal-lifecycle-management-script-event
;
type
internal-lifecycle-management-script-event
;
description
"Describes VNF lifecycle event(s) or an external stimulus
detected on a VNFM reference point."
;
...
...
src/yang/etsi-nfv.yang
View file @
c570c31b
...
...
@@ -3,9 +3,10 @@ module etsi-nfv {
namespace
"urn:etsi:params:xml:ns:yang:etsi-nfv"
;
prefix
nfv
;
include
etsi-nfv-common
;
include
etsi-nfv-ns
;
include
etsi-nfv-vnf
;
include
etsi-nfv-pnf
;
include
etsi-nfv-ns
;
organization
"European Telecommunications Standards Institute (ETSI)"
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment