diff options
| author |   Manuel Buil <mbuil@suse.com> | 2017-02-14 10:24:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-14 10:24:22 +0000 |
| commit | 306daf5219a2ba7975c2cc22096e41fd39f91918 (patch) | |
| tree | 64ebe19fd3cee11909261f34c066c503e0083057 | |
| parent | 7ca87d1d825d3a4e303e18cc7f2355895e4581ad (diff) | |
| parent | 4386d54b6765828d3ccc41d79aa169d7350d74c4 (diff) | |
Merge "Fix image name in vnfd templates and config.yaml"
| -rw-r--r-- | sfc/tests/functest/config.yaml | 6 | ||||
| -rw-r--r-- | sfc/tests/functest/vnfd-templates/test-vnfd1.yaml | 2 | ||||
| -rw-r--r-- | sfc/tests/functest/vnfd-templates/test-vnfd2.yaml | 2 | ||||
| -rw-r--r-- | sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml | 2 | ||||
| -rw-r--r-- | sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sfc/tests/functest/config.yaml b/sfc/tests/functest/config.yaml index 512660a7..b6f9c138 100644 --- a/sfc/tests/functest/config.yaml +++ b/sfc/tests/functest/config.yaml @@ -4,14 +4,14 @@ defaults: ram_size_in_mb: 1500 disk_size_in_gb: 10 vcpu_count: 1 - image_name: sfc_cloud - image_file_name: sfc_cloud.qcow2 + image_name: sfc_nsh_danube + image_file_name: sfc_nsh_danube.qcow2 fuel_master_ip: 10.20.0.2 fuel_master_uname: root fuel_master_passwd: r00tme fuel_environment: # Change this to the id of the desired fuel env (1, 2, 3...) image_format: qcow2 - url: "http://artifacts.opnfv.org/sfc/random" + url: "http://artifacts.opnfv.org/sfc/images" vnfd-dir: "vnfd-templates" testcases: diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml index 5c672e38..fd862ea0 100644 --- a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml @@ -10,7 +10,7 @@ service_properties: vdus: vdu1: id: vdu1 - vm_image: sf_nsh_colorado + vm_image: sfc_nsh_danube instance_type: custom service_type: firewall1 diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml index 8a570ab9..5451358d 100644 --- a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml +++ b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml @@ -10,7 +10,7 @@ service_properties: vdus: vdu1: id: vdu1 - vm_image: sf_nsh_colorado + vm_image: sfc_nsh_danube instance_type: custom service_type: firewall2 diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml index 09d093d1..1d8da125 100644 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml @@ -10,7 +10,7 @@ service_properties: vdus: vdu1: id: vdu1 - vm_image: sf_nsh_colorado + vm_image: sfc_nsh_danube instance_type: custom service_type: firewall1 diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml index b4aa81b3..280fc9e5 100644 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml +++ b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml @@ -10,7 +10,7 @@ service_properties: vdus: vdu1: id: vdu1 - vm_image: sf_nsh_colorado + vm_image: sfc_nsh_danube instance_type: custom service_type: firewall2 |