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
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
99581fa1
Commit
99581fa1
authored
Mar 05, 2019
by
Mahesh Jethanandani
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'bug#102'
# Conflicts: # src/yang/etsi-nfv-vnf.yang
parents
537c2f8c
2517918a
Pipeline
#360
passed with stage
in 0 seconds
Changes
5
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
607 additions
and
188 deletions
+607
-188
nfv.xml
example-data/nfv.xml
+13
-13
etsi-nfv-common.yang
src/yang/etsi-nfv-common.yang
+112
-2
etsi-nfv-ns.yang
src/yang/etsi-nfv-ns.yang
+44
-14
etsi-nfv-pnf.yang
src/yang/etsi-nfv-pnf.yang
+1
-0
etsi-nfv-vnf.yang
src/yang/etsi-nfv-vnf.yang
+437
-159
No files found.
example-data/nfv.xml
View file @
99581fa1
...
...
@@ -4,7 +4,7 @@
<provider>
My Company
</provider>
<product-name>
My Company ASAv
</product-name>
<software-version>
9.8
</software-version>
<version>
9.8
</version>
<version>
9.8
</version>
<vnfm-info>
My Company Vnfm
</vnfm-info>
<vdu>
<id>
firewall
</id>
...
...
@@ -206,7 +206,7 @@
<vnf-profile>
<id>
firewall
</id>
<vnfd-id>
ASA
</vnfd-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<instantiation-level>
single
</instantiation-level>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
...
...
@@ -289,7 +289,7 @@
<vnf-profile>
<id>
firewall
</id>
<vnfd-id>
ASA
</vnfd-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<instantiation-level>
single
</instantiation-level>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
...
...
@@ -311,7 +311,7 @@
<vnf-profile>
<id>
router
</id>
<vnfd-id>
CSR
</vnfd-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<instantiation-level>
single
</instantiation-level>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
...
...
@@ -333,7 +333,7 @@
<virtual-link-profile>
<id>
mgmt
</id>
<virtual-link-desc-id>
mgmt
</virtual-link-desc-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<max-bitrate-requirements>
<root>
1000
</root>
</max-bitrate-requirements>
...
...
@@ -344,7 +344,7 @@
<virtual-link-profile>
<id>
r2fw
</id>
<virtual-link-desc-id>
r2fw
</virtual-link-desc-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<max-bitrate-requirements>
<root>
10000000
</root>
</max-bitrate-requirements>
...
...
@@ -370,7 +370,7 @@
<vnf-profile>
<id>
firewall
</id>
<vnfd-id>
ASA
</vnfd-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<instantiation-level>
single
</instantiation-level>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
...
...
@@ -399,7 +399,7 @@
<vnf-profile>
<id>
router
</id>
<vnfd-id>
CSR
</vnfd-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<instantiation-level>
single
</instantiation-level>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
...
...
@@ -432,7 +432,7 @@
<virtual-link-profile>
<id>
fw2dpi
</id>
<virtual-link-desc-id>
fw2dpi
</virtual-link-desc-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<max-bitrate-requirements>
<root>
1000000
</root>
</max-bitrate-requirements>
...
...
@@ -443,7 +443,7 @@
<virtual-link-profile>
<id>
mgmt
</id>
<virtual-link-desc-id>
mgmt
</virtual-link-desc-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<max-bitrate-requirements>
<root>
1000
</root>
</max-bitrate-requirements>
...
...
@@ -454,7 +454,7 @@
<virtual-link-profile>
<id>
r2fw
</id>
<virtual-link-desc-id>
r2fw
</virtual-link-desc-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<max-bitrate-requirements>
<root>
1000000
</root>
</max-bitrate-requirements>
...
...
@@ -514,7 +514,7 @@
<vnf-profile>
<id>
router
</id>
<vnfd-id>
CSR
</vnfd-id>
<flavo
r-id>
normal
</flavo
r-id>
<flavo
ur-id>
normal
</flavou
r-id>
<instantiation-level>
single
</instantiation-level>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
...
...
@@ -529,7 +529,7 @@
<virtual-link-profile>
<id>
r2fw
</id>
<virtual-link-desc-id>
r2fw
</virtual-link-desc-id>
<flavo
r-id>
r2fw
</flavo
r-id>
<flavo
ur-id>
r2fw
</flavou
r-id>
<max-bitrate-requirements>
<root>
500
</root>
</max-bitrate-requirements>
...
...
src/yang/etsi-nfv-common.yang
View file @
99581fa1
...
...
@@ -215,8 +215,8 @@ submodule etsi-nfv-common {
enum "end-healing";
enum "start-termination";
enum "end-termination";
enum "start-vnf-flavor-change";
enum "end-vnf-flavor-change";
enum "start-vnf-flavo
u
r-change";
enum "end-vnf-flavo
u
r-change";
enum "start-vnf-operation-change";
enum "end-vnf-operation-change";
enum "start-vnf-ext-conn-change";
...
...
@@ -571,5 +571,115 @@ submodule etsi-nfv-common {
reference
"GS NFV IFA011: Section 7.1.6.3 Cpd information element";
}
leaf security-group-rule-id {
type leafref {
path "/nfv/vnfd/security-group-rule/id";
}
description
"Reference of the security group rules bound to this
CPD.";
reference
"GS NFV IFA011: Section 7.1.6.3 Cpd information element";
}
}
grouping security-group-rule {
list security-group-rule {
key "id";
leaf id {
type string;
description
"Identifier of this SecurityGroupRule information
element.";
reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element.";
}
leaf description {
type string;
description
"Human readable description of the security group rule.";
reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element.";
}
leaf direction {
type enumeration {
enum ingress;
enum egress;
}
default "ingress";
description
"The direction in which the security group rule is applied.
Permitted values: INGRESS, EGRESS. Defaults to INGRESS.";
reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element.";
}
leaf ether-type {
type enumeration {
enum ipv4;
enum ipv6;
}
default "ipv4";
description
"Indicates the protocol carried over the Ethernet layer.
Permitted values: IPV4, IPV6. Defaults to IPV4.";
reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element.";
}
leaf protocol {
type enumeration {
enum tcp;
enum udp;
enum icmp;
}
default "tcp";
description
"Indicates the protocol carried over the IP layer.
Permitted values: any protocol defined in the IANA
protocol registry, e.g. TCP, UDP, ICMP, etc. Defaults
to TCP.";
reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element.";
}
leaf port-range-min {
must ". <= ../port-range-max";
type uint16;
default "0";
description
"Indicates minimum port number in the range that is
matched by the security group rule. Defaults to 0.";
reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element.";
}
leaf port-range-max {
must ". >= ../port-range-min";
type uint16;
default "65535";
description
"Indicates maximum port number in the range that is
matched by the security group rule. Defaults to 65535.";
reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element.";
}
description
"Defines security group rules to be used by the VNF.";
reference
"GS NFV IFA011: Section 7.1.2, VNFD information element.";
}
}
}
src/yang/etsi-nfv-ns.yang
View file @
99581fa1
...
...
@@ -415,25 +415,54 @@ submodule etsi-nfv-ns {
key "id";
description
"
A pool of descriptors of connection points attached to
one of the constituent VNFs and PNFs and/or one of the
SAPs of the parent NS or of a nested NS.";
"
Describes a pool of descriptors of connection points
attached to one of the constituent VNFs and PNFs and/or
one of the
SAPs of the parent NS or of a nested NS.";
reference
"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
element";
leaf id {
type string;
}
choice constituent-base-element-id {
mandatory "true";
container vnf-profile {
leaf vnf-profile-id {
must ". = deref(../../vnfd-profile-id)" {
}
type leafref {
path "/nfv/nsd/df/vnf-profile/id";
}
}
}
container pnf-profile {
leaf pnf-profile-id {
must ". = deref(../../pnfd-profile-id)" {
}
type leafref {
path "/nfv/nsd/df/pnf-profile/id";
}
}
}
container ns-profile {
leaf ns-profile-id {
must ". = deref(../../ns-profile-id)" {
}
type leafref {
path "/nfv/nsd/df/ns-profile/id";
}
}
}
description
"Identifier of this CpdPool information element. It
identifies a pool of descriptors of connection points
and NS SAPs.";
"Reference to the profile of an NS constituent.";
reference
"GS NFV IFA014: Section 6.4.
4.2 CpdPool information
element";
"GS NFV IFA014: Section 6.4.
8 CpdInConstituentElement
information
element";
}
choice cpd-id {
choice c
onstituent-c
pd-id {
container vnf {
leaf vnfd-id {
must ". = deref(../../vnfd-profile-id)/../vnfd-id" {
...
...
@@ -464,7 +493,8 @@ submodule etsi-nfv-ns {
}
container ns {
leaf nsd-id {
must ". = deref(../../nested-ns-profile-id)/../nsd-id" {
must ". = deref(../../nested-ns-profile-id)/" +
"../nsd-id" {
}
type leafref {
...
...
@@ -645,7 +675,7 @@ submodule etsi-nfv-ns {
"GS NFV IFA014: Section 6.3.2.2 NsDf information element";
}
leaf flavor-key {
leaf flavo
u
r-key {
type leafref {
path "../monitored-info/id";
}
...
...
@@ -696,7 +726,7 @@ submodule etsi-nfv-ns {
element";
}
leaf flavor-id {
leaf flavo
u
r-id {
mandatory true;
type leafref {
path "deref(../vnfd-id)/../df/id";
...
...
@@ -711,7 +741,7 @@ submodule etsi-nfv-ns {
leaf instantiation-level {
mandatory true;
type leafref {
path "deref(../flavor-id)/../instantiation-level/id";
path "deref(../flavo
u
r-id)/../instantiation-level/id";
}
description
"Identifier of the instantiation level of the VNF DF
...
...
@@ -945,7 +975,7 @@ submodule etsi-nfv-ns {
information element";
}
leaf flavor-id {
leaf flavo
u
r-id {
mandatory true;
type leafref {
path "deref(../virtual-link-desc-id)/../df/id";
...
...
src/yang/etsi-nfv-pnf.yang
View file @
99581fa1
...
...
@@ -111,6 +111,7 @@ submodule etsi-nfv-pnf {
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
uses security-group-rule;
}
}
}
src/yang/etsi-nfv-vnf.yang
View file @
99581fa1
This diff is collapsed.
Click to expand it.
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