Skip to content
Snippets Groups Projects
Commit 935ed29b authored by vicens's avatar vicens
Browse files

Merge branch 'ramonsalguer-master-patch-74666' into 'master' 

Tests slicing: change image name to "ubuntu18.04"

See merge request !28
parents eb61f608 353fb81b
No related branches found
No related tags found
1 merge request!28Tests slicing: change image name to "ubuntu18.04"
Hide whitespace changes
Inline Side-by-side
slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml
+ 77
− 77
View file @ 935ed29b
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
vnfd-catalog:
vnfd:
- id: slice_basic_middle_vnf
name: slice_basic_middle_vnf
short-name: slice_basic_middle_vnf
description: VNFD with 3 CPs to be used on Slice Testing
vendor: OSM
version: '1.0'
# Management interface
mgmt-interface:
cp: eth0
# Atleast one VDU need to be specified
vdu:
- id: ubuntu_slice-VM
name: ubuntu_slice-VM
description: ubuntu_slice-VM
count: 1
cloud-init-file: cloud-config.txt
# Flavour of the VM to be instantiated for the VDU
# flavor below can fit into m1.micro
vm-flavor:
vcpu-count: 1
memory-mb: 1024
storage-gb: 10
# Image/checksum or image including the full path
image: 'bionic'
#checksum:
interface:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
- name: eth1
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth1
- name: eth2
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth2
connection-point:
- name: eth0
type: VPORT
- name: eth1
type: VPORT
- name: eth2
type: VPORT
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
vnfd-catalog:
vnfd:
- id: slice_basic_middle_vnf
name: slice_basic_middle_vnf
short-name: slice_basic_middle_vnf
description: VNFD with 3 CPs to be used on Slice Testing
vendor: OSM
version: '1.0'
# Management interface
mgmt-interface:
cp: eth0
# Atleast one VDU need to be specified
vdu:
- id: ubuntu_slice-VM
name: ubuntu_slice-VM
description: ubuntu_slice-VM
count: 1
cloud-init-file: cloud-config.txt
# Flavour of the VM to be instantiated for the VDU
# flavor below can fit into m1.micro
vm-flavor:
vcpu-count: 1
memory-mb: 1024
storage-gb: 10
# Image/checksum or image including the full path
image: 'ubuntu18.04'
#checksum:
interface:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
- name: eth1
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth1
- name: eth2
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth2
connection-point:
- name: eth0
type: VPORT
- name: eth1
type: VPORT
- name: eth2
type: VPORT
slice_basic_vnf/slice_basic_vnfd.yaml
+ 68
− 68
View file @ 935ed29b
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
vnfd-catalog:
vnfd:
- id: slice_basic_vnf
name: slice_basic_vnf
short-name: slice_basic_vnf
description: VNFD with 2 CPs to be used on Slice Testing
vendor: OSM
version: '1.0'
# Management interface
mgmt-interface:
cp: eth0
# Atleast one VDU need to be specified
vdu:
- id: ubuntu_slice-VM
name: ubuntu_slice-VM
description: ubuntu_slice-VM
count: 1
cloud-init-file: cloud-config.txt
# Flavour of the VM to be instantiated for the VDU
# flavor below can fit into m1.micro
vm-flavor:
vcpu-count: 1
memory-mb: 1024
storage-gb: 10
# Image/checksum or image including the full path
image: 'bionic'
#checksum:
interface:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
- name: eth1
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth1
connection-point:
- name: eth0
type: VPORT
- name: eth1
type: VPORT
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
vnfd-catalog:
vnfd:
- id: slice_basic_vnf
name: slice_basic_vnf
short-name: slice_basic_vnf
description: VNFD with 2 CPs to be used on Slice Testing
vendor: OSM
version: '1.0'
# Management interface
mgmt-interface:
cp: eth0
# Atleast one VDU need to be specified
vdu:
- id: ubuntu_slice-VM
name: ubuntu_slice-VM
description: ubuntu_slice-VM
count: 1
cloud-init-file: cloud-config.txt
# Flavour of the VM to be instantiated for the VDU
# flavor below can fit into m1.micro
vm-flavor:
vcpu-count: 1
memory-mb: 1024
storage-gb: 10
# Image/checksum or image including the full path
image: 'ubuntu18.04'
#checksum:
interface:
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
- name: eth1
type: EXTERNAL
virtual-interface:
type: VIRTIO
bandwidth: 0
vpci: 0000:00:0a.0
external-connection-point-ref: eth1
connection-point:
- name: eth0
type: VPORT
- name: eth1
type: VPORT
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment