Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
S
SOL006
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
7
Issues
7
List
Board
Labels
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NFV - Network Functions Virtualisation
SOL006
Commits
d5e80ad4
Commit
d5e80ad4
authored
Apr 17, 2019
by
Mahesh Jethanandani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates based on feedback from Bruno
parent
0269a8d8
Pipeline
#811
passed with stage
in 0 seconds
Changes
7
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1296 additions
and
1258 deletions
+1296
-1258
nfv-vnfd.xml
example-data/nfv-vnfd.xml
+2
-2
nfv.xml
example-data/nfv.xml
+12
-12
run-test.sh
run-test.sh
+2
-2
etsi-nfv-descriptors.yang
src/yang/etsi-nfv-descriptors.yang
+27
-3
etsi-nfv-ns.yang
src/yang/etsi-nfv-ns.yang
+1165
-1155
etsi-nfv-pnf.yang
src/yang/etsi-nfv-pnf.yang
+83
-79
etsi-nfv-vnfd.yang
src/yang/etsi-nfv-vnfd.yang
+5
-5
No files found.
example-data/nfv-vnf
-pkg
.xml
→
example-data/nfv-vnf
d
.xml
View file @
d5e80ad4
<
pkg
xmlns=
"urn:etsi:nfv:yang:etsi-nfv-pkg
"
>
<
vnfd
xmlns=
"urn:etsi:nfv:yang:etsi-nfv-vnfd
"
>
<id>
ASA
</id>
<id>
ASA
</id>
<provider>
My Company
</provider>
<provider>
My Company
</provider>
<product-name>
My Company ASAv
</product-name>
<product-name>
My Company ASAv
</product-name>
...
@@ -87,4 +87,4 @@
...
@@ -87,4 +87,4 @@
</instantiation-level>
</instantiation-level>
<default-instantiation-level>
single
</default-instantiation-level>
<default-instantiation-level>
single
</default-instantiation-level>
</df>
</df>
</
pkg
>
</
vnfd
>
example-data/nfv.xml
View file @
d5e80ad4
<nfv
xmlns=
"urn:etsi:nfv:yang:etsi-nfv-descriptors"
>
<nfv
xmlns=
"urn:etsi:nfv:yang:etsi-nfv-descriptors"
>
<vnfd>
<vnfd
s
>
<id>
ASA
</id>
<id>
ASA
</id>
<provider>
My Company
</provider>
<provider>
My Company
</provider>
<product-name>
My Company ASAv
</product-name>
<product-name>
My Company ASAv
</product-name>
...
@@ -100,8 +100,8 @@
...
@@ -100,8 +100,8 @@
</instantiation-level>
</instantiation-level>
<default-instantiation-level>
single
</default-instantiation-level>
<default-instantiation-level>
single
</default-instantiation-level>
</df>
</df>
</vnfd>
</vnfd
s
>
<vnfd>
<vnfd
s
>
<id>
CSR
</id>
<id>
CSR
</id>
<provider>
My Company
</provider>
<provider>
My Company
</provider>
<product-name>
My Company CSR 1000v
</product-name>
<product-name>
My Company CSR 1000v
</product-name>
...
@@ -202,8 +202,8 @@
...
@@ -202,8 +202,8 @@
</instantiation-level>
</instantiation-level>
<default-instantiation-level>
single
</default-instantiation-level>
<default-instantiation-level>
single
</default-instantiation-level>
</df>
</df>
</vnfd>
</vnfd
s
>
<nsd>
<nsd
s
>
<id>
firewall-nsd
</id>
<id>
firewall-nsd
</id>
<vnfd-id>
ASA
</vnfd-id>
<vnfd-id>
ASA
</vnfd-id>
<sapd>
<sapd>
...
@@ -233,8 +233,8 @@
...
@@ -233,8 +233,8 @@
</vnf-to-level-mapping>
</vnf-to-level-mapping>
</ns-instantiation-level>
</ns-instantiation-level>
</df>
</df>
</nsd>
</nsd
s
>
<nsd>
<nsd
s
>
<id>
service-chain-1
</id>
<id>
service-chain-1
</id>
<vnfd-id>
ASA
</vnfd-id>
<vnfd-id>
ASA
</vnfd-id>
<vnfd-id>
CSR
</vnfd-id>
<vnfd-id>
CSR
</vnfd-id>
...
@@ -483,8 +483,8 @@
...
@@ -483,8 +483,8 @@
</vnf-to-level-mapping>
</vnf-to-level-mapping>
</ns-instantiation-level>
</ns-instantiation-level>
</df>
</df>
</nsd>
</nsd
s
>
<nsd>
<nsd
s
>
<id>
service-chain-2
</id>
<id>
service-chain-2
</id>
<nested-nsd-id>
firewall-nsd
</nested-nsd-id>
<nested-nsd-id>
firewall-nsd
</nested-nsd-id>
<vnfd-id>
CSR
</vnfd-id>
<vnfd-id>
CSR
</vnfd-id>
...
@@ -570,13 +570,13 @@
...
@@ -570,13 +570,13 @@
</virtual-link-connectivity>
</virtual-link-connectivity>
</ns-profile>
</ns-profile>
</df>
</df>
</nsd>
</nsd
s
>
<pnfd>
<pnfd
s
>
<id>
physical-dpi
</id>
<id>
physical-dpi
</id>
<version>
1.0
</version>
<version>
1.0
</version>
<ext-cpd>
<ext-cpd>
<id>
outside
</id>
<id>
outside
</id>
<layer-protocol>
ethernet
</layer-protocol>
<layer-protocol>
ethernet
</layer-protocol>
</ext-cpd>
</ext-cpd>
</pnfd>
</pnfd
s
>
</nfv>
</nfv>
run-test.sh
View file @
d5e80ad4
...
@@ -11,7 +11,7 @@ CONFD_OPTS="--fail-on-warnings"
...
@@ -11,7 +11,7 @@ CONFD_OPTS="--fail-on-warnings"
CONFD_OPTS
=
""
CONFD_OPTS
=
""
echo
"Testing compilations of pkg."
echo
"Testing compilations of pkg."
confdc
-c
$CONFD_OPTS
-o
/opt/confd/etc/confd/etsi-nfv-
pkg.fxs etsi-nfv-pkg
.yang
confdc
-c
$CONFD_OPTS
-o
/opt/confd/etc/confd/etsi-nfv-
vnfd.fxs etsi-nfv-vnfd
.yang
echo
"Testing compilations of descriptors."
echo
"Testing compilations of descriptors."
confdc
-c
$CONFD_OPTS
-o
/opt/confd/etc/confd/etsi-nfv-descriptors.fxs etsi-nfv-descriptors.yang
confdc
-c
$CONFD_OPTS
-o
/opt/confd/etc/confd/etsi-nfv-descriptors.fxs etsi-nfv-descriptors.yang
...
@@ -19,7 +19,7 @@ echo "Starting ConfD"
...
@@ -19,7 +19,7 @@ echo "Starting ConfD"
confd
confd
echo
"Loading Data for pkg"
echo
"Loading Data for pkg"
confd_load
-l
-m
nfv-vnf
-pkg
.xml
confd_load
-l
-m
nfv-vnf
d
.xml
echo
"Loading Data for descriptors"
echo
"Loading Data for descriptors"
confd_load
-l
-m
nfv.xml
confd_load
-l
-m
nfv.xml
...
...
src/yang/etsi-nfv-descriptors.yang
View file @
d5e80ad4
...
@@ -22,7 +22,7 @@ module etsi-nfv-descriptors {
...
@@ -22,7 +22,7 @@ module etsi-nfv-descriptors {
}
}
container nfv {
container nfv {
list vnfd {
list vnfd
s
{
key "id";
key "id";
description
description
"A VNF Descriptor (VNFD) is a deployment template which
"A VNF Descriptor (VNFD) is a deployment template which
...
@@ -35,7 +35,31 @@ module etsi-nfv-descriptors {
...
@@ -35,7 +35,31 @@ module etsi-nfv-descriptors {
uses vnfd;
uses vnfd;
}
}
uses nsd;
list nsds {
uses pnfd;
key "id";
description
"The NSD information element is a deployment template whose
instances are used by the NFVO for the lifecycle
management of NSs.";
reference
"GS NFV-IFA014: Section 6.2.2, Network Service Descriptor
information element.";
uses nsd;
}
list pnfds {
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 pnfd;
}
}
}
}
}
src/yang/etsi-nfv-ns.yang
View file @
d5e80ad4
This diff is collapsed.
Click to expand it.
src/yang/etsi-nfv-pnf.yang
View file @
d5e80ad4
...
@@ -31,87 +31,91 @@ submodule etsi-nfv-pnf {
...
@@ -31,87 +31,91 @@ submodule etsi-nfv-pnf {
reference
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
list pnfd {
leaf id {
type string;
description
"Identifier of this Pnfd information element. It uniquely
identifies the PNFD.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf function-description {
type string;
description
"Describes the PNF function.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf provider {
type string;
description
"Identifies the provider of the PNFD.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf version {
type string;
mandatory true;
description
"Identifies the version of the PNFD.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf invariant-id {
type string;
description
"Identifies a PNFD in a version independent manner. This
attribute is invariant across versions of PNFD.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf name {
type string;
description
"Provides the human readable name of the PNFD.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
list ext-cpd {
key "id";
key "id";
uses cpd;
description
"Specifies the characteristics of one or more connection
points where to connect the PNF to a VL.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
list security {
key "signature";
uses security-parameters;
description
"Provides a signature to prevent tampering.
Editor's Note: While IFA014 does specify that the PNFD
includes a security parameter. SOL001 does not have one.
We need to harmonize SOL001 & SOL006 on this point.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf id {
leaf geographical-location-info {
type string;
type string;
description
description
"Identifier of this Pnfd information element. It uniquely
"It provides information about the geographical location
identifies the PNFD.";
(e.g. geographic coordinates or address of the building,
reference
etc.) of the PNF. The cardinality 0 is used when the
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
location is unknown.
}
Editor's Note: The type is TBD in SOL001. We need to make
leaf function-description {
a common SOL001/SOL006 decision.";
type string;
reference
description
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
"Describes the PNF function.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf provider {
type string;
description
"Identifies the provider of the PNFD.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf version {
type string;
mandatory true;
description
"Identifies the version of the PNFD.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf invariant-id {
type string;
description
"Identifies a PNFD in a version independent manner. This
attribute is invariant across versions of PNFD.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf name {
type string;
description
"Provides the human readable name of the PNFD.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
list ext-cpd {
key "id";
uses cpd;
description
"Specifies the characteristics of one or more connection
points where to connect the PNF to a VL.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
list security {
key "signature";
uses security-parameters;
description
"Provides a signature to prevent tampering.
Editor's Note: While IFA014 does specify that the PNFD
includes a security parameter. SOL001 does not have one.
We need to harmonize SOL001 & SOL006 on this point.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
leaf geographical-location-info {
type string;
description
"It provides information about the geographical location
(e.g. geographic coordinates or address of the building,
etc.) of the PNF. The cardinality 0 is used when the
location is unknown.
Editor's Note: The type is TBD in SOL001. We need to make
a common SOL001/SOL006 decision.";
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
uses security-group-rule;
}
}
uses security-group-rule;
}
}
}
}
src/yang/etsi-nfv-
pkg
.yang
→
src/yang/etsi-nfv-
vnfd
.yang
View file @
d5e80ad4
module etsi-nfv-
pkg
{
module etsi-nfv-
vnfd
{
yang-version 1.1;
yang-version 1.1;
namespace "urn:etsi:nfv:yang:etsi-nfv-
pkg
";
namespace "urn:etsi:nfv:yang:etsi-nfv-
vnfd
";
prefix pkg;
prefix pkg;
import etsi-nfv-descriptors {
import etsi-nfv-descriptors {
...
@@ -11,7 +11,7 @@ module etsi-nfv-pkg {
...
@@ -11,7 +11,7 @@ module etsi-nfv-pkg {
"European Telecommunications Standards Institute (ETSI)";
"European Telecommunications Standards Institute (ETSI)";
description
description
"
Network Function Virtualization Package
.";
"
Virtual Network Function Descriptor
.";
revision 2019-03-18 {
revision 2019-03-18 {
description
description
...
@@ -19,8 +19,8 @@ module etsi-nfv-pkg {
...
@@ -19,8 +19,8 @@ module etsi-nfv-pkg {
VNFD according to ETSI GS NFV-IFA 011 Ed261v254.";
VNFD according to ETSI GS NFV-IFA 011 Ed261v254.";
}
}
container
pkg
{
container
vnfd
{
presence "
Package
container.";
presence "
VNFD
container.";
uses vnf:vnfd;
uses vnf:vnfd;
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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