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
af01b8b7
Commit
af01b8b7
authored
Mar 26, 2019
by
Mahesh Jethanandani
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug#188' into 'master'
Fix for Bug#188 See merge request
!33
parents
2e8b2a5b
d4cb663b
Pipeline
#500
passed with stage
in 0 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
24 deletions
+24
-24
nfv.xml
example-data/nfv.xml
+17
-17
etsi-nfv-common.yang
src/yang/etsi-nfv-common.yang
+7
-7
No files found.
example-data/nfv.xml
View file @
af01b8b7
...
...
@@ -11,15 +11,15 @@
<name>
Firewall VDU
</name>
<int-cpd>
<id>
inside
</id>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
management
</id>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
outside
</id>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</int-cpd>
<virtual-compute-desc>
asa-vcd
</virtual-compute-desc>
<virtual-storage-desc>
asa-vsd
</virtual-storage-desc>
...
...
@@ -52,7 +52,7 @@
<vdu-id>
firewall
</vdu-id>
<cpd>
inside
</cpd>
</int-cpd>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>
management
</id>
...
...
@@ -60,7 +60,7 @@
<vdu-id>
firewall
</vdu-id>
<cpd>
management
</cpd>
</int-cpd>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>
outside
</id>
...
...
@@ -68,7 +68,7 @@
<vdu-id>
firewall
</vdu-id>
<cpd>
outside
</cpd>
</int-cpd>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</ext-cpd>
<df>
<id>
normal
</id>
...
...
@@ -106,15 +106,15 @@
<name>
Router VDU
</name>
<int-cpd>
<id>
left
</id>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
management
</id>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
right
</id>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</int-cpd>
<virtual-compute-desc>
csr-vcd
</virtual-compute-desc>
<virtual-storage-desc>
csr-vsd
</virtual-storage-desc>
...
...
@@ -147,7 +147,7 @@
<vdu-id>
router
</vdu-id>
<cpd>
left
</cpd>
</int-cpd>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>
management
</id>
...
...
@@ -155,7 +155,7 @@
<vdu-id>
router
</vdu-id>
<cpd>
management
</cpd>
</int-cpd>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>
right
</id>
...
...
@@ -163,7 +163,7 @@
<vdu-id>
router
</vdu-id>
<cpd>
right
</cpd>
</int-cpd>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</ext-cpd>
<df>
<id>
normal
</id>
...
...
@@ -243,7 +243,7 @@
<id>
fw2dpi
</id>
<connectivity-type>
<layer-protocol>
<protocol>
E
thernet
</protocol>
<protocol>
e
thernet
</protocol>
</layer-protocol>
</connectivity-type>
<df>
...
...
@@ -258,7 +258,7 @@
<id>
mgmt
</id>
<connectivity-type>
<layer-protocol>
<protocol>
IP
v4
</protocol>
<protocol>
ip
v4
</protocol>
</layer-protocol>
</connectivity-type>
<df>
...
...
@@ -273,7 +273,7 @@
<id>
r2fw
</id>
<connectivity-type>
<layer-protocol>
<protocol>
E
thernet
</protocol>
<protocol>
e
thernet
</protocol>
</layer-protocol>
</connectivity-type>
<df>
...
...
@@ -498,7 +498,7 @@
<id>
r2fw
</id>
<connectivity-type>
<layer-protocol>
<protocol>
IP
v4
</protocol>
<protocol>
ip
v4
</protocol>
</layer-protocol>
</connectivity-type>
<df>
...
...
@@ -570,7 +570,7 @@
<version>
1.0
</version>
<ext-cpd>
<id>
outside
</id>
<layer-protocol>
E
thernet
</layer-protocol>
<layer-protocol>
e
thernet
</layer-protocol>
</ext-cpd>
</pnfd>
</nfv>
src/yang/etsi-nfv-common.yang
View file @
af01b8b7
...
...
@@ -20,22 +20,22 @@ submodule etsi-nfv-common {
*/
identity layer-protocol {
}
identity
E
thernet {
identity
e
thernet {
base layer-protocol;
}
identity
MPLS
{
identity
mpls
{
base layer-protocol;
}
identity
ODU
2 {
identity
odu
2 {
base layer-protocol;
}
identity
IP
v4 {
identity
ip
v4 {
base layer-protocol;
}
identity
IP
v6 {
identity
ip
v6 {
base layer-protocol;
}
identity
Pseudo-W
ire {
identity
pseudo-w
ire {
base layer-protocol;
}
...
...
@@ -432,7 +432,7 @@ submodule etsi-nfv-common {
}
leaf-list layer-protocol {
default
E
thernet;
default
e
thernet;
type identityref {
base layer-protocol;
}
...
...
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