Commit 24df01c9 authored by garciadeblas's avatar garciadeblas
Browse files

updated instructions and url to get images and upload to Openstack

parent f81d65c9
Loading
Loading
Loading
Loading
+36 −21
Original line number Diff line number Diff line
@@ -37,12 +37,13 @@ In addition, the following images are needed for the tests, and must be uploaded

- `ubuntu16.04`: [xenial-server-cloudimg-amd64-disk1.img](https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img)
- `ubuntu18.04`: [bionic-server-cloudimg-amd64.img](https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img)
- `US1604`: [US1604.qcow2](https://osm-download.etsi.org/ftp/osm-3.0-three/1st-hackfest/images/US1604.qcow2)
- `hackfest-pktgen`: [hackfest-pktgen.qcow2](https://osm-download.etsi.org/ftp/osm-3.0-three/1st-hackfest/images/hackfest-pktgen.qcow2)
- `cirros034`: [cirros-0.3.4-x86\_64-disk.img](https://osm-download.etsi.org/ftp/osm-3.0-three/1st-hackfest/images/cirros-0.3.4-x86_64-disk.img)
- `sfc_nsh_fraser`: [sfc_nsh_fraser.qcow2](https://osm-download.etsi.org/ftp/osm-5.0-five/6th-hackfest/images/sfc_nsh_fraser.qcow2)
- `intel_vbng34`: TODO: needs to be uploaded or superseded
- `intel_gen`: TODO: needs to be uploaded or superseded
- `cirros`: [cirros-0.5.1-x86_64-disk.img](http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img)
- `US1604`: [US1604.qcow2](https://osm-download.etsi.org/ftp/images/tests/US1604.qcow2)
- `hackfest-pktgen`: [hackfest-pktgen.qcow2](https://osm-download.etsi.org/ftp/images/tests/hackfest-pktgen.qcow2)
- `sfc_nsh_fraser`: [sfc_nsh_fraser.qcow2](https://osm-download.etsi.org/ftp/images/tests/sfc_nsh_fraser.qcow2)
- `intel_vbng34`: [intel_vbng34.qcow2](https://osm-download.etsi.org/ftp/images/tests/intel_vbng34.qcow2)
- `intel_vbng_gen`: [intel_gen.qcow2](https://osm-download.etsi.org/ftp/images/tests/intel_gen.qcow2)
- `vyos-1.1.7`: [vyos-1.1.7-cloudinit.qcow2](https://osm-download.etsi.org/ftp/images/tests/vyos-1.1.7-cloudinit.qcow2)

In the case of OpenStack VIMs, they can be uploaded following this procedure:

@@ -50,37 +51,51 @@ In the case of OpenStack VIMs, they can be uploaded following this procedure:
DISK_FORMAT=qcow2
#DISK_FORMAT=vmdk   # For VIO, use this format instead of qcow2

openstack image show cirros034 >/dev/null 2>&1 || \
wget https://osm-download.etsi.org/ftp/osm-3.0-three/1st-hackfest/images/cirros-0.3.4-x86_64-disk.img && \
openstack image create --disk-format $DISK_FORMAT --public --file cirros-0.3.4-x86_64-disk.img cirros034
# Test images
openstack image show cirros >/dev/null 2>&1 || \
wget http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img && \
openstack image create --disk-format $DISK_FORMAT --public --file cirros-0.5.1-x86_64-disk.img cirros && \
rm cirros-0.5.1-x86_64-disk.img

openstack image show ubuntu18.04 >/dev/null 2>&1 || \
wget https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img && \
openstack image create --disk-format $DISK_FORMAT --public --file bionic-server-cloudimg-amd64.img ubuntu18.04
openstack image create --disk-format $DISK_FORMAT --public --file bionic-server-cloudimg-amd64.img ubuntu18.04 && \
rm bionic-server-cloudimg-amd64.img

openstack image show ubuntu16.04 >/dev/null 2>&1 || \
wget https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img && \
openstack image create --disk-format $DISK_FORMAT --public --file xenial-server-cloudimg-amd64-disk1.img ubuntu16.04
openstack image create --disk-format $DISK_FORMAT --public --file xenial-server-cloudimg-amd64-disk1.img ubuntu16.04 && \
rm xenial-server-cloudimg-amd64-disk1.img

openstack image show US1604 >/dev/null 2>&1 || \
wget https://osm-download.etsi.org/ftp/osm-3.0-three/1st-hackfest/images/US1604.qcow2 && \
openstack image create --disk-format $DISK_FORMAT --public --file US1604.qcow2 US1604
wget https://osm-download.etsi.org/ftp/images/tests/US1604.qcow2 && \
openstack image create --disk-format $DISK_FORMAT --public --file US1604.qcow2 US1604 && \
rm US1604.qcow2

openstack image show hackfest-pktgen >/dev/null 2>&1 || \
wget https://osm-download.etsi.org/ftp/osm-3.0-three/1st-hackfest/images/hackfest-pktgen.qcow2 && \
openstack image create --disk-format $DISK_FORMAT --public --file hackfest-pktgen.qcow2 hackfest-pktgen
wget https://osm-download.etsi.org/ftp/images/tests/hackfest-pktgen.qcow2 && \
openstack image create --disk-format $DISK_FORMAT --public --file hackfest-pktgen.qcow2 hackfest-pktgen && \
rm hackfest-pktgen.qcow2

openstack image show sfc_nsh_fraser >/dev/null 2>&1 || \
wget https://osm-download.etsi.org/ftp/osm-5.0-five/6th-hackfest/images/sfc_nsh_fraser.qcow2 && \
openstack image create --disk-format $DISK_FORMAT --public --file sfc_nsh_fraser.qcow2 sfc_nsh_fraser
wget https://osm-download.etsi.org/ftp/images/tests/sfc_nsh_fraser.qcow2 && \
openstack image create --disk-format $DISK_FORMAT --public --file sfc_nsh_fraser.qcow2 sfc_nsh_fraser && \
rm sfc_nsh_fraser.qcow2

openstack image show intel_vbng34 >/dev/null 2>&1 || \
wget https://osm-download.etsi.org/ftp/images/intel_vbng34.qcow && \
openstack image create --disk-format $DISK_FORMAT --public --file intel_vbng34.qcow intel_vbng34
wget https://osm-download.etsi.org/ftp/images/tests/intel_vbng34.qcow2 && \
openstack image create --disk-format $DISK_FORMAT --public --file intel_vbng34.qcow2 intel_vbng34 && \
rm intel_vbng34.qcow2

openstack image show intel_vbng_gen >/dev/null 2>&1 || \
wget https://osm-download.etsi.org/ftp/images/intel_gen.qcow && \
openstack image create --disk-format $DISK_FORMAT --public --file intel_gen.qcow intel_vbng_gen
wget https://osm-download.etsi.org/ftp/images/tests/intel_gen.qcow2 && \
openstack image create --disk-format $DISK_FORMAT --public --file intel_gen.qcow2 intel_vbng_gen && \
rm intel_gen.qcow2

openstack image show vyos-1.1.7 >/dev/null 2>&1 || \
wget https://osm-download.etsi.org/ftp/images/tests/vyos-1.1.7-cloudinit.qcow2 && \
openstack image create --disk-format $DISK_FORMAT --public --file vyos-1.1.7-cloudinit.qcow2 vyos-1.1.7 && \
rm vyos-1.1.7-cloudinit.qcow2
```

## Basic tests
+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ In this example the VNF is deployed to OpenStack1 being the cheapest VIM for the
As a precondition for this test, please make sure:

1. Your VIM has an accessible management network (in this case called "<VIM_MGMT_NET>")
2. Your VIM has the appropriate test image, in this case `vyos-1.1.7`.
2. Your VIM has the appropriate test image, in this case `vyos-1.1.7` ([vyos-1.1.7-cloudinit.qcow2](https://osm-download.etsi.org/ftp/images/tests/vyos-1.1.7-cloudinit.qcow2)).

These are the steps: