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
2145ff7f
Commit
2145ff7f
authored
Feb 19, 2019
by
Mahesh Jethanandani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issues with recreating merge request
parent
2290e1c9
Pipeline
#287
failed with stage
in 0 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
20 deletions
+13
-20
nfv.xml
example-data/nfv.xml
+0
-6
etsi-nfv-ns.yang
src/yang/etsi-nfv-ns.yang
+10
-13
etsi-nfv-vnf.yang
src/yang/etsi-nfv-vnf.yang
+3
-1
No files found.
example-data/nfv.xml
View file @
2145ff7f
...
...
@@ -11,17 +11,14 @@
<name>
Firewall VDU
</name>
<int-cpd>
<id>
inside
</id>
<ext-cpd>
inside
</ext-cpd>
<layer-protocol>
Ethernet
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
management
</id>
<ext-cpd>
management
</ext-cpd>
<layer-protocol>
Ethernet
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
outside
</id>
<ext-cpd>
outside
</ext-cpd>
<layer-protocol>
Ethernet
</layer-protocol>
</int-cpd>
<virtual-compute-desc>
asa-vcd
</virtual-compute-desc>
...
...
@@ -97,17 +94,14 @@
<name>
Router VDU
</name>
<int-cpd>
<id>
left
</id>
<ext-cpd>
left
</ext-cpd>
<layer-protocol>
Ethernet
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
management
</id>
<ext-cpd>
management
</ext-cpd>
<layer-protocol>
Ethernet
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
right
</id>
<ext-cpd>
right
</ext-cpd>
<layer-protocol>
Ethernet
</layer-protocol>
</int-cpd>
<virtual-compute-desc>
csr-vcd
</virtual-compute-desc>
...
...
src/yang/etsi-nfv-ns.yang
View file @
2145ff7f
...
...
@@ -4,10 +4,7 @@ submodule etsi-nfv-ns {
prefix nfv;
}
import etsi-nfv-common {
prefix common;
}
include etsi-nfv-common;
include etsi-nfv-vnf;
include etsi-nfv-pnf;
...
...
@@ -345,7 +342,7 @@ submodule etsi-nfv-ns {
"GS NFV IFA014: Section 6.5.2.2 NsVirtualLinkDesc
information element";
}
uses
common:
security-parameters;
uses security-parameters;
}
list vnffgd {
...
...
@@ -776,7 +773,7 @@ submodule etsi-nfv-ns {
element";
}
uses
common:
local-affinity-or-anti-affinity-rule;
uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
...
...
@@ -988,7 +985,7 @@ submodule etsi-nfv-ns {
information element";
}
uses
common:
local-affinity-or-anti-affinity-rule;
uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
...
...
@@ -1015,7 +1012,7 @@ submodule etsi-nfv-ns {
reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element";
uses
common:
link-bitrate-requirements;
uses link-bitrate-requirements;
}
container min-bitrate-requirements {
description
...
...
@@ -1024,7 +1021,7 @@ submodule etsi-nfv-ns {
reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element";
uses
common:
link-bitrate-requirements;
uses link-bitrate-requirements;
}
}
...
...
@@ -1104,7 +1101,7 @@ submodule etsi-nfv-ns {
leaf affinity-type {
mandatory true;
type
common:
affinity-type;
type affinity-type;
description
"Specifies the type of relationship that the members of
the group have: 'affinity' or 'anti-affinity.'";
...
...
@@ -1115,7 +1112,7 @@ submodule etsi-nfv-ns {
leaf affinity-scope {
mandatory true;
type
common:
affinity-scope;
type affinity-scope;
description
"Specifies the scope of the affinity or anti-affinity
relationship e.g. a NFVI node, an NFVI PoP, etc.";
...
...
@@ -1212,7 +1209,7 @@ submodule etsi-nfv-ns {
VirtualLinkToLevelMapping information element";
}
uses
common:
link-bitrate-requirements;
uses link-bitrate-requirements;
}
list ns-to-level-mapping {
...
...
@@ -1567,7 +1564,7 @@ submodule etsi-nfv-ns {
}
}
}
uses
common:
security-parameters;
uses security-parameters;
}
}
}
src/yang/etsi-nfv-vnf.yang
View file @
2145ff7f
...
...
@@ -1166,7 +1166,9 @@ submodule etsi-nfv-vnf {
}
}
leaf cpd {
path "deref(../vdu-id)/../int-cpd/id";
type leafref {
path "deref(../vdu-id)/../int-cpd/id";
}
}
}
}
...
...
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