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
22e51800
Commit
22e51800
authored
Apr 16, 2019
by
jethanandani
Browse files
Merge branch 'bug#170' into 'master'
Fix for Bug#170 See merge request
!21
parents
82f542ca
44e08987
Pipeline
#773
passed with stage
in 0 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
example-data/complex-vnfd.xml
0 → 100644
View file @
22e51800
<nfv
xmlns=
"urn:etsi:nfv:yang:etsi-nfv-descriptors"
>
<vnfd>
<id>
complex-vnf
</id>
<provider>
My Company
</provider>
<product-name>
complex-vnf
</product-name>
<software-version>
1.0
</software-version>
<version>
1.0
</version>
<vnfm-info>
netconf
</vnfm-info>
<vdu>
<id>
control-plane-active
</id>
<name>
control-plane-active
</name>
<int-cpd>
<id>
internal
</id>
<int-virtual-link-desc>
internal-vl
</int-virtual-link-desc>
<layer-protocol>
ipv4
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
mgmt
</id>
<int-virtual-link-desc>
mgmt
</int-virtual-link-desc>
<layer-protocol>
ipv4
</layer-protocol>
</int-cpd>
<virtual-compute-desc>
CP
</virtual-compute-desc>
<virtual-storage-desc>
root
</virtual-storage-desc>
<sw-image-desc>
CP
</sw-image-desc>
</vdu>
<vdu>
<id>
control-plane-standby
</id>
<name>
control-plane-standby
</name>
<int-cpd>
<id>
internal
</id>
<int-virtual-link-desc>
internal-vl
</int-virtual-link-desc>
<layer-protocol>
ipv4
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
mgmt
</id>
<int-virtual-link-desc>
mgmt
</int-virtual-link-desc>
<layer-protocol>
ipv4
</layer-protocol>
</int-cpd>
<virtual-compute-desc>
CP
</virtual-compute-desc>
<virtual-storage-desc>
root
</virtual-storage-desc>
<sw-image-desc>
CP
</sw-image-desc>
</vdu>
<vdu>
<id>
data-plane
</id>
<name>
data-plane
</name>
<int-cpd>
<id>
in
</id>
<layer-protocol>
ipv4
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
internal
</id>
<int-virtual-link-desc>
internal-vl
</int-virtual-link-desc>
<layer-protocol>
ipv4
</layer-protocol>
</int-cpd>
<int-cpd>
<id>
out
</id>
<layer-protocol>
ipv4
</layer-protocol>
</int-cpd>
<virtual-compute-desc>
DP
</virtual-compute-desc>
<virtual-storage-desc>
root
</virtual-storage-desc>
<sw-image-desc>
DP
</sw-image-desc>
</vdu>
<virtual-compute-desc>
<id>
CP
</id>
<virtual-memory>
<size>
16.0
</size>
</virtual-memory>
<virtual-cpu>
<num-virtual-cpu>
8
</num-virtual-cpu>
</virtual-cpu>
</virtual-compute-desc>
<virtual-compute-desc>
<id>
DP
</id>
<virtual-memory>
<size>
32.0
</size>
</virtual-memory>
<virtual-cpu>
<num-virtual-cpu>
16
</num-virtual-cpu>
</virtual-cpu>
</virtual-compute-desc>
<virtual-storage-descriptor>
<id>
root
</id>
<type-of-storage>
root-storage
</type-of-storage>
<size-of-storage>
10
</size-of-storage>
</virtual-storage-descriptor>
<sw-image-desc>
<id>
CP
</id>
<name>
CP
</name>
<version>
1.1
</version>
<checksum>
<algorithm>
sha-224
</algorithm>
<hash>
deadbeef
</hash>
</checksum>
<container-format>
bare
</container-format>
<disk-format>
qcow2
</disk-format>
<min-ram>
2.0
</min-ram>
<size>
1
</size>
<image>
http://mycompany.images.com/control-plane.qcow2
</image>
</sw-image-desc>
<sw-image-desc>
<id>
DP
</id>
<name>
DP
</name>
<version>
1.1
</version>
<checksum>
<algorithm>
sha-224
</algorithm>
<hash>
deadbeef
</hash>
</checksum>
<container-format>
bare
</container-format>
<disk-format>
qcow2
</disk-format>
<min-ram>
2.0
</min-ram>
<size>
1
</size>
<image>
http://mycompany.images.com/data-plane.qcow2
</image>
</sw-image-desc>
<int-virtual-link-desc>
<id>
internal-vl
</id>
<connectivity-type>
<layer-protocol>
<protocol>
ipv4
</protocol>
</layer-protocol>
</connectivity-type>
</int-virtual-link-desc>
<int-virtual-link-desc>
<id>
mgmt
</id>
<connectivity-type>
<layer-protocol>
<protocol>
ipv4
</protocol>
</layer-protocol>
</connectivity-type>
</int-virtual-link-desc>
<ext-cpd>
<id>
in
</id>
<int-cpd>
<vdu-id>
data-plane
</vdu-id>
<cpd>
in
</cpd>
</int-cpd>
<layer-protocol>
ipv4
</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>
mgmt
</id>
<int-virtual-link-desc>
mgmt
</int-virtual-link-desc>
<layer-protocol>
ipv4
</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>
out
</id>
<int-cpd>
<vdu-id>
data-plane
</vdu-id>
<cpd>
out
</cpd>
</int-cpd>
<layer-protocol>
ipv4
</layer-protocol>
</ext-cpd>
<df>
<id>
gold
</id>
<vdu-profile>
<id>
control-plane-active
</id>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
<affinity-or-anti-affinity-group>
<id>
control-plane
</id>
</affinity-or-anti-affinity-group>
</vdu-profile>
<vdu-profile>
<id>
control-plane-standby
</id>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
<affinity-or-anti-affinity-group>
<id>
control-plane
</id>
</affinity-or-anti-affinity-group>
</vdu-profile>
<vdu-profile>
<id>
data-plane
</id>
<min-number-of-instances>
2
</min-number-of-instances>
<max-number-of-instances>
8
</max-number-of-instances>
</vdu-profile>
<instantiation-level>
<id>
il-1
</id>
<vdu-level>
<vdu-id>
control-plane-active
</vdu-id>
<number-of-instances>
1
</number-of-instances>
</vdu-level>
<vdu-level>
<vdu-id>
control-plane-standby
</vdu-id>
<number-of-instances>
1
</number-of-instances>
</vdu-level>
<vdu-level>
<vdu-id>
data-plane
</vdu-id>
<number-of-instances>
2
</number-of-instances>
</vdu-level>
</instantiation-level>
<instantiation-level>
<id>
il-2
</id>
<vdu-level>
<vdu-id>
control-plane-active
</vdu-id>
<number-of-instances>
1
</number-of-instances>
</vdu-level>
<vdu-level>
<vdu-id>
control-plane-standby
</vdu-id>
<number-of-instances>
1
</number-of-instances>
</vdu-level>
<vdu-level>
<vdu-id>
data-plane
</vdu-id>
<number-of-instances>
4
</number-of-instances>
</vdu-level>
</instantiation-level>
<default-instantiation-level>
il-1
</default-instantiation-level>
<affinity-or-anti-affinity-group>
<id>
control-plane
</id>
<type>
anti-affinity
</type>
<scope>
nfvi-node
</scope>
</affinity-or-anti-affinity-group>
</df>
<df>
<id>
silver
</id>
<vdu-profile>
<id>
control-plane-active
</id>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
<affinity-or-anti-affinity-group>
<id>
control-plane
</id>
</affinity-or-anti-affinity-group>
</vdu-profile>
<vdu-profile>
<id>
control-plane-standby
</id>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
1
</max-number-of-instances>
<affinity-or-anti-affinity-group>
<id>
control-plane
</id>
</affinity-or-anti-affinity-group>
</vdu-profile>
<vdu-profile>
<id>
data-plane
</id>
<min-number-of-instances>
1
</min-number-of-instances>
<max-number-of-instances>
4
</max-number-of-instances>
</vdu-profile>
<instantiation-level>
<id>
il-1
</id>
<vdu-level>
<vdu-id>
control-plane-active
</vdu-id>
<number-of-instances>
1
</number-of-instances>
</vdu-level>
<vdu-level>
<vdu-id>
control-plane-standby
</vdu-id>
<number-of-instances>
1
</number-of-instances>
</vdu-level>
<vdu-level>
<vdu-id>
data-plane
</vdu-id>
<number-of-instances>
1
</number-of-instances>
</vdu-level>
</instantiation-level>
<instantiation-level>
<id>
il-2
</id>
<vdu-level>
<vdu-id>
control-plane-active
</vdu-id>
<number-of-instances>
1
</number-of-instances>
</vdu-level>
<vdu-level>
<vdu-id>
control-plane-standby
</vdu-id>
<number-of-instances>
1
</number-of-instances>
</vdu-level>
<vdu-level>
<vdu-id>
data-plane
</vdu-id>
<number-of-instances>
2
</number-of-instances>
</vdu-level>
</instantiation-level>
<default-instantiation-level>
il-1
</default-instantiation-level>
<affinity-or-anti-affinity-group>
<id>
control-plane
</id>
<type>
anti-affinity
</type>
<scope>
nfvi-node
</scope>
</affinity-or-anti-affinity-group>
</df>
</vnfd>
</nfv>
example-data/nfv.xml
View file @
22e51800
...
...
@@ -51,7 +51,7 @@
<disk-format>
qcow2
</disk-format>
<min-ram>
2.0
</min-ram>
<size>
1
</size>
<image>
http://
www.cisco
.com/asa.qcow2
</image>
<image>
http://
mycompany.images
.com/asa.qcow2
</image>
</sw-image-desc>
<ext-cpd>
<id>
inside
</id>
...
...
@@ -153,7 +153,7 @@
<disk-format>
qcow2
</disk-format>
<min-ram>
2.0
</min-ram>
<size>
1
</size>
<image>
http://
www.cisco
.com/csr.qcow2
</image>
<image>
http://
mycompany.images
.com/csr.qcow2
</image>
</sw-image-desc>
<ext-cpd>
<id>
left
</id>
...
...
run-test.sh
View file @
22e51800
...
...
@@ -15,8 +15,10 @@ confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-descriptors.fxs etsi-nfv-
echo
"Starting ConfD"
confd
echo
"Loading
D
ata"
echo
"Loading
d
ata
for the simple example
"
confd_load
-l
-m
nfv.xml
echo
"Loading data for the complex Vnfd example"
confd_load
-l
-m
complex-vnfd.xml
# Don't do this in the actual test, just waste of cycles
# echo "Stopping ConfD"
...
...
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