Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
NFV - Network Functions Virtualisation
SOL006
Commits
a8316c63
Commit
a8316c63
authored
Jun 18, 2019
by
jethanandani
Browse files
Merge branch 'bug#237' into 'v2.7.1'
Add vnic-type that was missing See merge request
!43
parents
fb9620e7
f00f5749
Pipeline
#1103
passed with stage
in 0 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
example-data/complex-vnfd.xml
View file @
a8316c63
...
...
@@ -78,11 +78,11 @@
<num-virtual-cpu>
16
</num-virtual-cpu>
</virtual-cpu>
</virtual-compute-desc>
<virtual-storage-desc
riptor
>
<virtual-storage-desc>
<id>
root
</id>
<type-of-storage>
root-storage
</type-of-storage>
<size-of-storage>
10
</size-of-storage>
</virtual-storage-desc
riptor
>
</virtual-storage-desc>
<sw-image-desc>
<id>
CP
</id>
<name>
CP
</name>
...
...
@@ -116,17 +116,13 @@
<int-virtual-link-desc>
<id>
internal-vl
</id>
<connectivity-type>
<layer-protocol>
<protocol>
ipv4
</protocol>
</layer-protocol>
<layer-protocol>
ipv4
</layer-protocol>
</connectivity-type>
</int-virtual-link-desc>
<int-virtual-link-desc>
<id>
mgmt
</id>
<connectivity-type>
<layer-protocol>
<protocol>
ipv4
</protocol>
</layer-protocol>
<layer-protocol>
ipv4
</layer-protocol>
</connectivity-type>
</int-virtual-link-desc>
<ext-cpd>
...
...
example-data/nfv-nsd.xml
View file @
a8316c63
...
...
@@ -49,6 +49,7 @@
</checksum>
<container-format>
bare
</container-format>
<disk-format>
qcow2
</disk-format>
<min-disk>
1
</min-disk>
<min-ram>
2.0
</min-ram>
<size>
1
</size>
<image>
http://www.cisco.com/asa.qcow2
</image>
...
...
example-data/nfv-vnfd.xml
View file @
a8316c63
...
...
@@ -48,6 +48,7 @@
</checksum>
<container-format>
bare
</container-format>
<disk-format>
qcow2
</disk-format>
<min-disk>
1
</min-disk>
<min-ram>
2.0
</min-ram>
<size>
1
</size>
<image>
http://www.cisco.com/asa.qcow2
</image>
...
...
src/yang/etsi-nfv-common.yang
View file @
a8316c63
...
...
@@ -243,6 +243,62 @@ submodule etsi-nfv-common {
"Ephemeral type of storage."
;
}
identity
vnic-type
{
description
"Describes the type of the virtual network interface realizing
the CPs instantiated from this CPD. This is used to determine
which mechanism driver(s) to be used to bind the port. Value:
• NORMAL
• VIRTIO
• DIRECT
• BAREMETAL
• VIRTIO-FORWARDER
• DIRECT-PHYSICAL
• SMART-NIC"
;
}
identity
normal
{
base
vnic-type
;
description
"Normal NIC."
;
}
identity
virtio
{
base
vnic-type
;
description
"VirtIO NIC."
;
}
identity
direct
{
base
vnic-type
;
description
"Direct NIC type."
;
}
identity
bare-metal
{
base
vnic-type
;
description
"Bare metal NIC type."
;
}
identity
virtio-forwarder
{
base
vnic-type
;
description
"VirtIO Forwarder NIC type."
;
}
identity
direct-physical
{
base
vnic-type
;
description
"Direct physical NIC type."
;
}
identity
smart-nic
{
base
vnic-type
;
description
"SmartNIC or Smart NIC type."
;
}
/*
* Typedefs
*/
...
...
src/yang/etsi-nfv-vnf.yang
View file @
a8316c63
...
...
@@ -273,7 +273,7 @@ submodule etsi-nfv-vnf {
VirtualNetworkInterfaceRequirements information element"
;
}
leaf
-list
order
{
leaf
order
{
type
uint32
;
description
"The order of the NIC to be assigned on the compute
...
...
@@ -292,6 +292,27 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.4, VduCpd information
element."
;
}
leaf
vnic-type
{
type
identityref
{
base
vnic-type
;
}
description
"Describes the type of the virtual network interface
realizing the CPs instantiated from this CPD. This is
used to determine which mechanism driver(s) to be used
to bind the port. Value:
• NORMAL
• VIRTIO
• DIRECT
• BAREMETAL
• VIRTIO-FORWARDER
• DIRECT-PHYSICAL
• SMART-NIC"
;
reference
"GS NFV IFA011: Section 7.1.6.4, VduCpd information
element."
;
}
uses
cpd
;
leaf
security-group-rule-id
{
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment