diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-01-31 11:17:25 +0100 |
|---|---|---|
| committer |   Brady Johnson <bjohnson@inocybe.com> | 2018-01-31 15:57:17 +0000 |
| commit | 7abf19f9cc194213484873770148cf5bc980aefd (patch) | |
| tree | 2d6fd9adffa5a3c8d361f8cea0e009cf0c98e5e7 | |
| parent | 3f89ce129fb00647fa58bb273235ad3a2c8a0ba9 (diff) | |
Use the new vnf image for Fraser
Change-Id: I11c37ed6898c03b2a54a0e3b11422c654023333f
Signed-off-by: Manuel Buil <mbuil@suse.com>
6 files changed, 17 insertions, 17 deletions
diff --git a/sfc/lib/test_utils.py b/sfc/lib/test_utils.py index 9cdc02b2..a04f1e24 100644 --- a/sfc/lib/test_utils.py +++ b/sfc/lib/test_utils.py @@ -95,7 +95,7 @@ def start_http_server(ip, iterations_check=10): logger.info(output) while iterations_check > 0: - _, output, _ = run_cmd_remote(ip, "ss -na | grep *:80") + _, output, _ = run_cmd_remote(ip, "netstat -pntl | grep :80") if output: return True else: diff --git a/sfc/tests/functest/config.yaml b/sfc/tests/functest/config.yaml index be37e626..31e0a2ae 100644 --- a/sfc/tests/functest/config.yaml +++ b/sfc/tests/functest/config.yaml @@ -2,10 +2,10 @@ defaults: # odl-sfc uses custom flavors as per below params flavor: custom - ram_size_in_mb: 1500 - disk_size_in_gb: 10 + ram_size_in_mb: 500 + disk_size_in_gb: 1 vcpu_count: 1 - image_name: sfc_nsh_euphrates + image_name: sfc_nsh_fraser installer: fuel: user: root @@ -18,7 +18,7 @@ defaults: user: root pkey_file: "/root/.ssh/id_rsa" image_format: qcow2 - image_url: "http://artifacts.opnfv.org/sfc/images/sfc_nsh_euphrates.qcow2" + image_url: "http://artifacts.opnfv.org/sfc/images/sfc_nsh_fraser.qcow2" vnfd-dir: "vnfd-templates" vnfd-default-params-file: "test-vnfd-default-params.yaml" diff --git a/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd1.yaml index 4042222c..cc5947c6 100644 --- a/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd1.yaml @@ -15,10 +15,10 @@ topology_template: nfv_compute: properties: num_cpus: 1 - mem_size: 2 GB - disk_size: 10 GB + mem_size: 500 MB + disk_size: 1 GB properties: - image: sfc_nsh_euphrates + image: sfc_nsh_fraser availability_zone: {get_input: zone} mgmt_driver: noop config: | diff --git a/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd2.yaml index 42308c6c..395245a9 100644 --- a/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd2.yaml +++ b/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd2.yaml @@ -15,10 +15,10 @@ topology_template: nfv_compute: properties: num_cpus: 1 - mem_size: 2 GB - disk_size: 10 GB + mem_size: 500 MB + disk_size: 1 GB properties: - image: sfc_nsh_euphrates + image: sfc_nsh_fraser availability_zone: {get_input: zone} mgmt_driver: noop config: | diff --git a/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd1.yaml index 4042222c..cc5947c6 100644 --- a/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd1.yaml @@ -15,10 +15,10 @@ topology_template: nfv_compute: properties: num_cpus: 1 - mem_size: 2 GB - disk_size: 10 GB + mem_size: 500 MB + disk_size: 1 GB properties: - image: sfc_nsh_euphrates + image: sfc_nsh_fraser availability_zone: {get_input: zone} mgmt_driver: noop config: | diff --git a/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd2.yaml index ac4f223d..df719b9e 100644 --- a/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd2.yaml +++ b/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd2.yaml @@ -15,10 +15,10 @@ topology_template: nfv_compute: properties: num_cpus: 1 - mem_size: 2 GB - disk_size: 10 GB + mem_size: 500 MB + disk_size: 1 GB properties: - image: sfc_nsh_euphrates + image: sfc_nsh_fraser availability_zone: {get_input: zone} mgmt_driver: noop config: | |