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
3a78b0d7
Commit
3a78b0d7
authored
Feb 22, 2019
by
Mahesh Jethanandani
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug#93' into 'master'
Bug#93 See merge request
!26
parents
7a962aa2
130ab486
Pipeline
#330
passed with stage
in 0 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
43 additions
and
29 deletions
+43
-29
nfv.xml
example-data/nfv.xml
+12
-4
etsi-nfv-common.yang
src/yang/etsi-nfv-common.yang
+16
-10
etsi-nfv-ns.yang
src/yang/etsi-nfv-ns.yang
+3
-3
etsi-nfv-pnf.yang
src/yang/etsi-nfv-pnf.yang
+3
-3
etsi-nfv-vnf.yang
src/yang/etsi-nfv-vnf.yang
+6
-6
etsi-nfv.yang
src/yang/etsi-nfv.yang
+3
-3
No files found.
example-data/nfv.xml
View file @
3a78b0d7
...
...
@@ -242,7 +242,9 @@
<virtual-link-desc>
<id>
fw2dpi
</id>
<connectivity-type>
<layer-protocol>
Ethernet
</layer-protocol>
<layer-protocol>
<protocol>
Ethernet
</protocol>
</layer-protocol>
</connectivity-type>
<df>
<id>
normal
</id>
...
...
@@ -255,7 +257,9 @@
<virtual-link-desc>
<id>
mgmt
</id>
<connectivity-type>
<layer-protocol>
IPv4
</layer-protocol>
<layer-protocol>
<protocol>
IPv4
</protocol>
</layer-protocol>
</connectivity-type>
<df>
<id>
normal
</id>
...
...
@@ -268,7 +272,9 @@
<virtual-link-desc>
<id>
r2fw
</id>
<connectivity-type>
<layer-protocol>
Ethernet
</layer-protocol>
<layer-protocol>
<protocol>
Ethernet
</protocol>
</layer-protocol>
</connectivity-type>
<df>
<id>
normal
</id>
...
...
@@ -491,7 +497,9 @@
<virtual-link-desc>
<id>
r2fw
</id>
<connectivity-type>
<layer-protocol>
IPv4
</layer-protocol>
<layer-protocol>
<protocol>
IPv4
</protocol>
</layer-protocol>
</connectivity-type>
<df>
<id>
r2fw
</id>
...
...
src/yang/etsi-nfv-common.yang
View file @
3a78b0d7
...
...
@@ -6,13 +6,13 @@ submodule etsi-nfv-common {
description
"Common data types for ETSI data models.";
revision 201
8-06-19
{
revision 201
9-03-18
{
description
"Initial revision
Common data structures to support VNFD and NSD according to:
ETSI GS NFV-IFA 014 Ed2
51v244
ETSI GS NFV-IFA 011 Ed2
51v243
";
ETSI GS NFV-IFA 014 Ed2
61v252
ETSI GS NFV-IFA 011 Ed2
61v254
";
}
/*
...
...
@@ -253,14 +253,20 @@ submodule etsi-nfv-common {
grouping connectivity-type {
container connectivity-type {
leaf layer-protocol {
mandatory true;
type identityref {
base layer-protocol;
}
list layer-protocol {
key "protocol";
leaf protocol {
type identityref {
base layer-protocol;
}
}
description
"Identifies the protocol this VL gives access to (Ethernet,
MPLS, ODU2, IPV4, IPV6, Pseudo-Wire).";
"Identifies the protocols that the VL uses (Ethernet,
MPLS, ODU2, IPV4, IPV6, Pseudo-Wire). The top layer
protocol of the VL protocol stack shall always be provided.
The lower layer protocols may be included when there are
specific requirements on these layers.";
reference
"GS NFV IFA011: Section 7.1.7.3, ConnectivityType
information element.";
...
...
src/yang/etsi-nfv-ns.yang
View file @
3a78b0d7
...
...
@@ -11,14 +11,14 @@ submodule etsi-nfv-ns {
description
"Models for NS according to ETSI GS NFV-IFA 014.";
revision 201
7-01-20
{
revision 201
9-03-18
{
description
"Initial revision
Common data structure to support NSD according to:
ETSI GS NFV-IFA 01
1 Ed251v243
";
ETSI GS NFV-IFA 01
4 Ed261v252
";
reference
"ETSI GS NFV-IFA 01
1 Ed251v243
";
"ETSI GS NFV-IFA 01
4 Ed261v252
";
}
grouping resource-handle {
...
...
src/yang/etsi-nfv-pnf.yang
View file @
3a78b0d7
...
...
@@ -12,15 +12,15 @@ submodule etsi-nfv-pnf {
description
"Models for PNFD according to GS NFV-IFA 014.";
revision 201
8-06-25
{
revision 201
9-03-18
{
description
"Initial revision.
Common data structure to support VNFD according to:
ETSI GS NFV-IFA 014 Ed2
51v244
";
ETSI GS NFV-IFA 014 Ed2
61v252
";
reference
"ETSI GS NFV-IFA 014 Ed2
51v244
";
"ETSI GS NFV-IFA 014 Ed2
61v252
";
}
grouping pnfd {
...
...
src/yang/etsi-nfv-vnf.yang
View file @
3a78b0d7
...
...
@@ -16,15 +16,15 @@ submodule etsi-nfv-vnf {
description
"Models for VNFD according to GS NFV-IFA 011.";
revision 201
8-06-19
{
revision 201
9-03-18
{
description
"Initial revision.
Common data structure to support VNFD according to:
VNFD according to ETSI GS NFV-IFA 011 Ed2
51v243
";
VNFD according to ETSI GS NFV-IFA 011 Ed2
61v254
";
reference
"ETSI GS NFV-IFA 011 Ed2
51v243
";
"ETSI GS NFV-IFA 011 Ed2
61v254
";
}
grouping virtual-network-interface-requirements {
...
...
@@ -1148,9 +1148,9 @@ submodule etsi-nfv-vnf {
}
}
leaf cpd {
type leafref {
path "deref(../vdu-id)/../int-cpd/id";
}
type leafref {
path "deref(../vdu-id)/../int-cpd/id";
}
}
}
}
...
...
src/yang/etsi-nfv.yang
View file @
3a78b0d7
...
...
@@ -14,11 +14,11 @@ module etsi-nfv {
description
"Network Function Virtualization Descriptors";
revision 201
8-06-13
{
revision 201
9-03-18
{
description
"Initial revision.
NSD and PNFD according to ETSI GS NFV-IFA 014 Ed2
51v244
VNFD according to ETSI GS NFV-IFA 011 Ed2
51v243
";
NSD and PNFD according to ETSI GS NFV-IFA 014 Ed2
61v252
VNFD according to ETSI GS NFV-IFA 011 Ed2
61v254
";
}
container nfv {
...
...
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