Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SOL006
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
NFV - Network Functions Virtualisation
SOL006
Commits
af01b8b7
Commit
af01b8b7
authored
5 years ago
by
jethanandani
Browse files
Options
Downloads
Plain Diff
Merge branch 'bug#188' into 'master'
Fix for Bug#188 See merge request
!33
parents
2e8b2a5b
d4cb663b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!33
Fix for Bug#188
Pipeline
#500
passed
5 years ago
Stage: external
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
example-data/nfv.xml
+17
-17
17 additions, 17 deletions
example-data/nfv.xml
src/yang/etsi-nfv-common.yang
+7
-7
7 additions, 7 deletions
src/yang/etsi-nfv-common.yang
with
24 additions
and
24 deletions
example-data/nfv.xml
+
17
−
17
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>
This diff is collapsed.
Click to expand it.
src/yang/etsi-nfv-common.yang
+
7
−
7
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
P
seudo-
W
ire
{
identity
p
seudo-
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
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment