aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--functest/opnfv_tests/vnf/ims/cloudify_ims.yaml28
-rw-r--r--functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml99
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra.yaml43
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml12
-rw-r--r--functest/opnfv_tests/vnf/router/test_scenario.yaml1
-rw-r--r--tox.ini17
6 files changed, 107 insertions, 93 deletions
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
index ad7fa70a9..e1a7bf316 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
@@ -1,13 +1,16 @@
+---
tenant_images:
- ubuntu_14.04: /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img
- cloudify_manager_4.0: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2
+ ubuntu_14.04:
+ /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img
+ cloudify_manager_4.0:
+ /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2
orchestrator:
name: cloudify
version: '4.0'
requirements:
flavor:
- name: m1.medium
- ram_min: 4096
+ name: m1.medium
+ ram_min: 4096
os_image: 'cloudify_manager_4.0'
vnf:
name: clearwater
@@ -15,19 +18,20 @@ vnf:
descriptor:
file_name: openstack-blueprint.yaml
name: clearwater-opnfv
- url: https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/archive/master.zip
+ url:
+ https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/archive/master.zip
version: '122'
requirements:
flavor:
- name: m1.small
- ram_min: 2048
+ name: m1.small
+ ram_min: 2048
compute_quotas:
- cores: 50
- instances: 15
+ cores: 50
+ instances: 15
network_quotas:
- security_group: 20
- security_group_rule: 100
- port: 50
+ security_group: 20
+ security_group_rule: 100
+ port: 50
inputs:
image_id: 'ubuntu_14.04'
flavor_id: 'm1.small'
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml
index 2d9697d0a..77b295d0a 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims_perf.yaml
@@ -1,16 +1,22 @@
+---
tenant_images:
- ubuntu_14.04: http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
- cloudify_manager_4.0: http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2
- IXIA_CHASSIS: # PATH of the virtual chassis image. Ex: Ixia_Virtual_Chassis_8.30_EA_KVM.qcow2
- IXIA_CARD: # PATH of the virtual card image. Ex: Ixia_Virtual_Load_Module_8.30_EA_KVM.qcow2
- IXIA_LOAD: # PATH of the virtual loader image. Ex: Ixia_Virtual_Loader_8.30_EA_KVM.qcow2
+ ubuntu_14.04:
+ http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
+ cloudify_manager_4.0:
+ http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2
+ # PATH of the virtual chassis image.
+ IXIA_CHASSIS: # Ixia_Virtual_Chassis_8.30_EA_KVM.qcow2
+ # PATH of the virtual card image.
+ IXIA_CARD: # Ixia_Virtual_Load_Module_8.30_EA_KVM.qcow2
+ # PATH of the virtual loader image.
+ IXIA_LOAD: # Ixia_Virtual_Loader_8.30_EA_KVM.qcow2
orchestrator:
name: cloudify
version: '4.0'
requirements:
flavor:
- name: m1.medium
- ram_min: 4096
+ name: m1.medium
+ ram_min: 4096
os_image: 'cloudify_manager_4.0'
vnf:
name: clearwater
@@ -18,20 +24,21 @@ vnf:
descriptor:
file_name: openstack-blueprint-with-numbers.yaml
name: clearwater-opnfv
- url: https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/archive/master.zip
+ url:
+ https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/archive/master.zip
version: '122'
requirements:
flavor:
- name: m1.small
- ram_min: 2048
+ name: m1.small
+ ram_min: 2048
compute_quotas:
- cores: 150
- instances: 100
- ram: 256000
+ cores: 150
+ instances: 100
+ ram: 256000
network_quotas:
- security_group: 25
- security_group_rule: 100
- port: 150
+ security_group: 25
+ security_group_rule: 100
+ port: 150
inputs:
image_id: 'ubuntu_14.04'
flavor_id: 'm1.small'
@@ -51,34 +58,34 @@ vnf_test_suite:
name: ixia
version: "8.30.0.161"
requirements:
- chassis:
- image: IXIA_CHASSIS
- card:
- image: IXIA_CARD
- load:
- image: IXIA_LOAD
+ chassis:
+ image: IXIA_CHASSIS
+ card:
+ image: IXIA_CARD
+ load:
+ image: IXIA_LOAD
inputs:
- ipgw: '10.67.79.1'
- pnregistering: '201001[0000-]'
- pncalling: '201000[0000-]'
- pncalled: '201000[5000-]'
- sipportregistering: '[5060-]'
- sipportcalling: '[5061-]'
- sipportcalled: '[5062-]'
- domainname: 'clearwater.opnfv'
- authpassword: 'toto'
- registeringtotalcalls: '1000'
- registeringduration: '180'
- activecalls: '1000'
- testduration: '360'
- test_filname: 'REG_CALL_OPNFV_v13.rxf'
- licenseServer: '' # IP of YOUR IXIA LICENSE SERVER
- stats:
- 'Signaling(VoIPSip)':
- - 'Successful Registrations'
- - 'Failed Registrations'
- - 'Active Calls'
- - 'Attempted Calls'
- - 'Received Calls'
- - 'Failed Attempted Calls'
- - 'Failed Received Calls'
+ ipgw: '10.67.79.1'
+ pnregistering: '201001[0000-]'
+ pncalling: '201000[0000-]'
+ pncalled: '201000[5000-]'
+ sipportregistering: '[5060-]'
+ sipportcalling: '[5061-]'
+ sipportcalled: '[5062-]'
+ domainname: 'clearwater.opnfv'
+ authpassword: 'toto'
+ registeringtotalcalls: '1000'
+ registeringduration: '180'
+ activecalls: '1000'
+ testduration: '360'
+ test_filname: 'REG_CALL_OPNFV_v13.rxf'
+ licenseServer: '' # IP of YOUR IXIA LICENSE SERVER
+ stats:
+ 'Signaling(VoIPSip)':
+ - 'Successful Registrations'
+ - 'Failed Registrations'
+ - 'Active Calls'
+ - 'Attempted Calls'
+ - 'Received Calls'
+ - 'Failed Attempted Calls'
+ - 'Failed Received Calls'
diff --git a/functest/opnfv_tests/vnf/ims/orchestra.yaml b/functest/opnfv_tests/vnf/ims/orchestra.yaml
index 457ca90e1..f81f55fbe 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra.yaml
+++ b/functest/opnfv_tests/vnf/ims/orchestra.yaml
@@ -1,27 +1,32 @@
+---
tenant_images:
orchestrator:
- ubuntu-14.04-server-cloudimg-amd64-disk1: /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img
+ ubuntu-14.04-server-cloudimg-amd64-disk1:
+ /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img
orchestra_openims:
openims: /home/opnfv/functest/images/img
orchestra_clearwaterims:
- ubuntu-14.04-server-cloudimg-amd64-disk1: /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img
+ ubuntu-14.04-server-cloudimg-amd64-disk1:
+ /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img
mano:
name: OpenBaton
version: '3.2.0'
requirements:
flavor:
- name: openbaton
- ram_min: 4096
- disk: 5
- vcpus: 2
+ name: openbaton
+ ram_min: 4096
+ disk: 5
+ vcpus: 2
image: 'ubuntu-14.04-server-cloudimg-amd64-disk1'
bootstrap:
url: http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap
config:
- url: http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap-config-file
+ url:
+ http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap-config-file
gvnfm:
userdata:
- url: https://raw.githubusercontent.com/openbaton/generic-vnfm/3.2.0/src/main/resources/user-data.sh
+ url:
+ https://raw.githubusercontent.com/openbaton/generic-vnfm/3.2.0/src/main/resources/user-data.sh
credentials:
username: admin
password: openbaton
@@ -29,13 +34,14 @@ mano:
orchestra_openims:
name: OpenIMS
descriptor:
- url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
+ url:
+ http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
requirements:
flavor:
- name: m1.small
- ram_min: 2048
- disk: 5
- vcpus: 2
+ name: m1.small
+ ram_min: 2048
+ disk: 5
+ vcpus: 2
test:
scscf:
ports: [3870, 6060]
@@ -51,11 +57,12 @@ orchestra_openims:
orchestra_clearwaterims:
name: Clearwater IMS
descriptor:
- url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json
+ url:
+ http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json
requirements:
flavor:
- name: m1.small
- ram_min: 2048
- disk: 5
- vcpus: 2
+ name: m1.small
+ ram_min: 2048
+ disk: 5
+ vcpus: 2
test:
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml b/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml
index c09477abc..58bdb66a3 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml
@@ -1,5 +1,7 @@
+---
tenant_images:
- cloudify_manager_4.0: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2
+ cloudify_manager_4.0:
+ /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2
vyos1.1.7: /home/opnfv/functest/images/vyos-1.1.7.img
test_data:
url: 'https://github.com/oolorg/opnfv-vnf-data.git'
@@ -9,8 +11,8 @@ orchestrator:
version: '4.0'
requirements:
flavor:
- name: m1.medium
- ram_min: 4096
+ name: m1.medium
+ ram_min: 4096
os_image: 'cloudify_manager_4.0'
vnf:
name: vyos1.1.7
@@ -21,8 +23,8 @@ vnf:
version: 'master'
requirements:
flavor:
- name: m1.medium
- ram_min: 2048
+ name: m1.medium
+ ram_min: 2048
inputs:
external_network_name: admin_floating_net
region: RegionOne
diff --git a/functest/opnfv_tests/vnf/router/test_scenario.yaml b/functest/opnfv_tests/vnf/router/test_scenario.yaml
index 03185592c..8bdaf06a3 100644
--- a/functest/opnfv_tests/vnf/router/test_scenario.yaml
+++ b/functest/opnfv_tests/vnf/router/test_scenario.yaml
@@ -1,3 +1,4 @@
+---
test_scenario_list:
-
test_type: 'function_test'
diff --git a/tox.ini b/tox.ini
index 9746954e1..8eeb1d17e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = docs,pep8,pylint,py35,py27,perm,cover
+envlist = docs,pep8,pylint,yamllint,py35,py27,perm,cover
[testenv]
usedevelop = True
@@ -45,19 +45,12 @@ commands =
[testenv:yamllint]
basepython = python2.7
files =
- docker/components/testcases.yaml
- docker/healthcheck/testcases.yaml
- docker/smoke/testcases.yaml
- docker/parser/testcases.yaml
- docker/features/testcases.yaml
- docker/vnf/testcases.yaml
- functest/ci/config_aarch64_patch.yaml
- functest/ci/config_functest.yaml
- functest/ci/config_patch.yaml
- functest/ci/testcases.yaml
+ docker
+ functest/ci
+ functest/opnfv_tests/vnf
commands =
yamllint {[testenv:yamllint]files}
- - yamllint functest
+ - yamllint functest/api
[testenv:py35]
dirs =