diff options
| -rw-r--r-- | INFO | 8 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64.patch | 23 | ||||
| -rw-r--r-- | dovetail/compliance/proposed_tests.yml | 12 | ||||
| -rw-r--r-- | dovetail/container.py | 21 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc002.yml | 6 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc003.yml | 4 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc004.yml | 4 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc005.yml | 4 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc006.yml | 9 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc007.yml | 8 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc008.yml | 12 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc009.yml | 13 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc010.yml | 12 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc011.yml | 13 | ||||
| -rw-r--r-- | dovetail/testcase/ha.tc012.yml | 11 | ||||
| -rw-r--r-- | dovetail/testcase/ipv6.tc023.yml | 2 | ||||
| -rw-r--r-- | userconfig/hosts.yaml | 2 |
17 files changed, 77 insertions, 87 deletions
@@ -7,7 +7,7 @@ Project Lead: Hongbo (hongbo.tianhongbo@huawei.com) Jira Project Name: OPNFV qualification testing Jira Project Prefix: dovetail Mailing list tag: [dovetail] -IRC: Server:freenode.net Channel:#opnfv-testperf +IRC: Server:freenode.net Channel:#opnfv-meeting Repository: dovetail Committers: @@ -15,6 +15,12 @@ christopher.price@ericsson.com wenjing.chu@huawei.com hongbo.tianhongbo@huawei.com dneary@redhat.com +georg.kunz@ericsson.com +trevor.cooper@intel.com +zshi@redhat.com +lylavoie@iol.unh.edu +grakiss.wanglei@huawei.com +fuqiao@chinamobile.com Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-09-01-13.59.html Link(s) to approval of additional committers: diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch index b96b619f..50fdc75c 100644 --- a/docker/Dockerfile.aarch64.patch +++ b/docker/Dockerfile.aarch64.patch @@ -1,14 +1,14 @@ From: Alexandru Nemes <alexandru.nemes@enea.com> -Date: Mon, 24 Apr 2017 11:53:42 +0300 +Date: Mon, 8 May 2017 19:04:37 +0300 Subject: [PATCH] Add AArch64 support for Dovetail docker file Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com> --- - docker/Dockerfile | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + docker/Dockerfile | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile -index 8cc15e0..bbab012 100644 +index 499624f..bbab012 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ @@ -21,7 +21,18 @@ index 8cc15e0..bbab012 100644 RUN \ apt-get update \ -@@ -28,6 +28,8 @@ RUN \ +@@ -16,9 +16,7 @@ RUN \ + wget \ + --no-install-recommends \ + && \ +- apt-get update +- +-RUN wget -qO- https://get.docker.com/ | sh ++ apt-get update && apt-get -y install docker.io + + ENV HOME /home/opnfv + ENV REPOS_DIR ${HOME}/dovetail +@@ -31,6 +29,8 @@ RUN \ && \ mkdir -p ${REPOS_DIR}/results \ && \ @@ -29,4 +40,4 @@ index 8cc15e0..bbab012 100644 +&& \ pip install -U pip \ && \ - pip install -r ${REPOS_DIR}/requirements.txt \ + pip install -r ${REPOS_DIR}/requirements.txt \
\ No newline at end of file diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml index cc4bfa8c..de892e5d 100644 --- a/dovetail/compliance/proposed_tests.yml +++ b/dovetail/compliance/proposed_tests.yml @@ -34,17 +34,15 @@ proposed_tests: # nfvi, vping_ssh, vping_userdata - dovetail.nfvi.tc001 - dovetail.nfvi.tc002 - # HA, ha.tc002, ha.tc012, will kill the host and can't restart, not ready yet, skip. + # HA - dovetail.ha.tc001 + - dovetail.ha.tc002 - dovetail.ha.tc003 - # - dovetail.ha.tc004 + - dovetail.ha.tc004 - dovetail.ha.tc005 - dovetail.ha.tc006 - # - dovetail.ha.tc007 - # - dovetail.ha.tc008 - - dovetail.ha.tc009 - # - dovetail.ha.tc010 - # - dovetail.ha.tc011 + - dovetail.ha.tc007 + - dovetail.ha.tc008 # sdnvpn - dovetail.sdnvpn.tc001 - dovetail.sdnvpn.tc002 diff --git a/dovetail/container.py b/dovetail/container.py index ae7c8e2e..11c64f49 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -8,6 +8,7 @@ # import os +import yaml import utils.dovetail_logger as dt_logger import utils.dovetail_utils as dt_utils @@ -149,10 +150,26 @@ class Container(object): ' -v %s:%s ' % (dovetail_config['userconfig_dir'], dovetail_config["functest"]['config']['dir']) + hosts_config = "" + hosts_config_path = os.path.abspath( + os.path.join(os.path.dirname(__file__), os.pardir, 'userconfig')) + try: + with open(os.path.join(hosts_config_path, 'hosts.yaml')) as f: + hosts_info = yaml.safe_load(f) + if hosts_info['hosts_info']: + for host in hosts_info['hosts_info']: + hosts_config += " --add-host " + hosts_config += str(host) + cls.logger.info('get hosts info %s', hosts_config) + except Exception: + cls.logger.warn('fail to get hosts info in %s/hosts.yaml, \ + maybe some issue with domain name resolution', + hosts_config_path) + result_volume = ' -v %s:%s ' % (dovetail_config['result_dir'], dovetail_config[type]['result']['dir']) - cmd = 'sudo docker run %s %s %s %s %s %s %s /bin/bash' % \ - (opts, envs, config, openrc, config_volume, + cmd = 'sudo docker run %s %s %s %s %s %s %s %s /bin/bash' % \ + (opts, envs, config, hosts_config, openrc, config_volume, result_volume, docker_image) dt_utils.exec_cmd(cmd, cls.logger) ret, container_id = \ diff --git a/dovetail/testcase/ha.tc002.yml b/dovetail/testcase/ha.tc002.yml index 393212f6..4ca78b45 100644 --- a/dovetail/testcase/ha.tc002.yml +++ b/dovetail/testcase/ha.tc002.yml @@ -1,10 +1,10 @@ --- dovetail.ha.tc002: name: dovetail.ha.tc002 - objective: > # This test case will verify the high availability of controller node. - # When one of the controller node abnormally shutdown, the service provided by it should be OK + objective: > # This test case will verify the high availability of the + # network service provided by OpenStack (neutro-server) on control node. validate: type: yardstick - testcase: opnfv_yardstick_tc025 + testcase: opnfv_yardstick_tc045 report: sub_testcase_list: diff --git a/dovetail/testcase/ha.tc003.yml b/dovetail/testcase/ha.tc003.yml index 2c012b9b..b3a0bf7b 100644 --- a/dovetail/testcase/ha.tc003.yml +++ b/dovetail/testcase/ha.tc003.yml @@ -2,9 +2,9 @@ dovetail.ha.tc003: name: dovetail.ha.tc003 objective: > # This test case will verify the high availability of the - # network service provided by OpenStack (neutro-server) on control node. + # user service provided by OpenStack (keystone) on control node. validate: type: yardstick - testcase: opnfv_yardstick_tc045 + testcase: opnfv_yardstick_tc046 report: sub_testcase_list: diff --git a/dovetail/testcase/ha.tc004.yml b/dovetail/testcase/ha.tc004.yml index e743415e..b25af983 100644 --- a/dovetail/testcase/ha.tc004.yml +++ b/dovetail/testcase/ha.tc004.yml @@ -2,9 +2,9 @@ dovetail.ha.tc004: name: dovetail.ha.tc004 objective: > # This test case will verify the high availability of the - # user service provided by OpenStack (keystone) on control node. + # image service provided by OpenStack (glance-api) on control node. validate: type: yardstick - testcase: opnfv_yardstick_tc046 + testcase: opnfv_yardstick_tc047 report: sub_testcase_list: diff --git a/dovetail/testcase/ha.tc005.yml b/dovetail/testcase/ha.tc005.yml index bd412e98..fd6e14d5 100644 --- a/dovetail/testcase/ha.tc005.yml +++ b/dovetail/testcase/ha.tc005.yml @@ -2,9 +2,9 @@ dovetail.ha.tc005: name: dovetail.ha.tc005 objective: > # This test case will verify the high availability of the - # image service provided by OpenStack (glance-api) on control node. + # volume service provided by OpenStack (cinder-api) on control node. validate: type: yardstick - testcase: opnfv_yardstick_tc047 + testcase: opnfv_yardstick_tc048 report: sub_testcase_list: diff --git a/dovetail/testcase/ha.tc006.yml b/dovetail/testcase/ha.tc006.yml index 52809bb9..aecbe8b2 100644 --- a/dovetail/testcase/ha.tc006.yml +++ b/dovetail/testcase/ha.tc006.yml @@ -1,10 +1,13 @@ --- dovetail.ha.tc006: name: dovetail.ha.tc006 - objective: > # This test case will verify the high availability of the - # volume service provided by OpenStack (cinder-api) on control node. + objective: > # This test case will verify the high availability of control node. + # When the CPU usage of a specified controller node is stressed to 100%, + # which breaks down the Openstack services on this node. These Openstack service + # should able to be accessed by other controller nodes, and the services on + # failed controller node should be isolated. validate: type: yardstick - testcase: opnfv_yardstick_tc048 + testcase: opnfv_yardstick_tc051 report: sub_testcase_list: diff --git a/dovetail/testcase/ha.tc007.yml b/dovetail/testcase/ha.tc007.yml index 8a8aff71..5d985534 100644 --- a/dovetail/testcase/ha.tc007.yml +++ b/dovetail/testcase/ha.tc007.yml @@ -1,10 +1,12 @@ --- dovetail.ha.tc007: name: dovetail.ha.tc007 - objective: > # This test case will verify the high availability of the - # storage service provided by OpenStack (swift-proxy) on control node. + objective: > # This test case will verify the high availability of control node. + # When the disk I/O of a specified disk is blocked, which breaks down the Openstack + # services on this node. Read and write services should still be accessed by other + # controller nodes, and the services on failed controller node should be isolated. validate: type: yardstick - testcase: opnfv_yardstick_tc049 + testcase: opnfv_yardstick_tc052 report: sub_testcase_list: diff --git a/dovetail/testcase/ha.tc008.yml b/dovetail/testcase/ha.tc008.yml index 3ee323f4..2287b8d1 100644 --- a/dovetail/testcase/ha.tc008.yml +++ b/dovetail/testcase/ha.tc008.yml @@ -1,13 +1,13 @@ --- dovetail.ha.tc008: name: dovetail.ha.tc008 - objective: > # This test case will verify the high availability of control node. - # When one of the controller failed to connect the network, which breaks down - # the Openstack services on this node. These Openstack service should able to - # be accessed by other controller nodes, and the services on failed controller - # node should be isolated + objective: > # This test case will verify the high availability of the load balance + # service(current is HAProxy) that supports OpenStack on controller node. When the + # load balance service of a specified controller node is killed, whether other + # load balancers on other controller nodes will work, and whether the controller node + # will restart the load balancer are checked. validate: type: yardstick - testcase: opnfv_yardstick_tc050 + testcase: opnfv_yardstick_tc053 report: sub_testcase_list: diff --git a/dovetail/testcase/ha.tc009.yml b/dovetail/testcase/ha.tc009.yml deleted file mode 100644 index 2625de59..00000000 --- a/dovetail/testcase/ha.tc009.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -dovetail.ha.tc009: - name: dovetail.ha.tc009 - objective: > # This test case will verify the high availability of control node. - # When the CPU usage of a specified controller node is stressed to 100%, - # which breaks down the Openstack services on this node. These Openstack service - # should able to be accessed by other controller nodes, and the services on - # failed controller node should be isolated. - validate: - type: yardstick - testcase: opnfv_yardstick_tc051 - report: - sub_testcase_list: diff --git a/dovetail/testcase/ha.tc010.yml b/dovetail/testcase/ha.tc010.yml deleted file mode 100644 index 254fa6fd..00000000 --- a/dovetail/testcase/ha.tc010.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -dovetail.ha.tc010: - name: dovetail.ha.tc010 - objective: > # This test case will verify the high availability of control node. - # When the disk I/O of a specified disk is blocked, which breaks down the Openstack - # services on this node. Read and write services should still be accessed by other - # controller nodes, and the services on failed controller node should be isolated. - validate: - type: yardstick - testcase: opnfv_yardstick_tc052 - report: - sub_testcase_list: diff --git a/dovetail/testcase/ha.tc011.yml b/dovetail/testcase/ha.tc011.yml deleted file mode 100644 index a3a91c9b..00000000 --- a/dovetail/testcase/ha.tc011.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -dovetail.ha.tc011: - name: dovetail.ha.tc011 - objective: > # This test case will verify the high availability of the load balance - # service(current is HAProxy) that supports OpenStack on controller node. When the - # load balance service of a specified controller node is killed, whether other - # load balancers on other controller nodes will work, and whether the controller node - # will restart the load balancer are checked. - validate: - type: yardstick - testcase: opnfv_yardstick_tc053 - report: - sub_testcase_list: diff --git a/dovetail/testcase/ha.tc012.yml b/dovetail/testcase/ha.tc012.yml deleted file mode 100644 index 127bf2d0..00000000 --- a/dovetail/testcase/ha.tc012.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -dovetail.ha.tc012: - name: dovetail.ha.tc012 - objective: > # This test case will verify the high availability for virtual ip in the environment. - # When master node of virtual ip is abnormally shutdown, connection to virtual ip and the - # services binded to the virtual IP it should be OK. - validate: - type: yardstick - testcase: opnfv_yardstick_tc054 - report: - sub_testcase_list: diff --git a/dovetail/testcase/ipv6.tc023.yml b/dovetail/testcase/ipv6.tc023.yml index aea1a12b..8b816252 100644 --- a/dovetail/testcase/ipv6.tc023.yml +++ b/dovetail/testcase/ipv6.tc023.yml @@ -10,4 +10,4 @@ dovetail.ipv6.tc023: dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os[compute,id-76f26acd-9688-42b4-bc3e-cd134c4cb09e,network,slow] + - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_slaac_from_os[compute,id-b6399d76-4438-4658-bcf5-0d6c8584fde2,network,slow] diff --git a/userconfig/hosts.yaml b/userconfig/hosts.yaml new file mode 100644 index 00000000..e4687dfb --- /dev/null +++ b/userconfig/hosts.yaml @@ -0,0 +1,2 @@ +--- +hosts_info: |