From b25c1371f82911ea26b8c893b6612bb5ae0c8c19 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 1 Mar 2018 20:03:59 +0800 Subject: leverage data_files to eliminate so many hardcoded abs_path_seekings 1. mv conf/ userconfig/ compliance/ patch to etc/ 2. after installation etc/ will be put under /etc/dovetail 3. leveraging /etc/dovetail in coding Change-Id: Icf9cb00ff7fc7cf35755f60d3e258b23e2c70839 Signed-off-by: SerenaFeng --- etc/userconfig/ansible.cfg | 2 + etc/userconfig/hosts.yaml.sample | 7 ++ etc/userconfig/pod.yaml.sample | 50 +++++++++ etc/userconfig/sdnvpn_config_tc000.yaml | 7 ++ etc/userconfig/sdnvpn_config_testcase1.yaml | 27 +++++ etc/userconfig/sdnvpn_config_testcase2.yaml | 37 +++++++ etc/userconfig/sdnvpn_config_testcase3.yaml | 26 +++++ etc/userconfig/sdnvpn_config_testcase4.yaml | 27 +++++ etc/userconfig/sdnvpn_config_testcase8.yaml | 23 ++++ etc/userconfig/tempest_conf.yaml.sample | 16 +++ etc/userconfig/testcases.yaml | 156 ++++++++++++++++++++++++++++ 11 files changed, 378 insertions(+) create mode 100644 etc/userconfig/ansible.cfg create mode 100644 etc/userconfig/hosts.yaml.sample create mode 100644 etc/userconfig/pod.yaml.sample create mode 100644 etc/userconfig/sdnvpn_config_tc000.yaml create mode 100644 etc/userconfig/sdnvpn_config_testcase1.yaml create mode 100644 etc/userconfig/sdnvpn_config_testcase2.yaml create mode 100644 etc/userconfig/sdnvpn_config_testcase3.yaml create mode 100644 etc/userconfig/sdnvpn_config_testcase4.yaml create mode 100644 etc/userconfig/sdnvpn_config_testcase8.yaml create mode 100644 etc/userconfig/tempest_conf.yaml.sample create mode 100644 etc/userconfig/testcases.yaml (limited to 'etc/userconfig') diff --git a/etc/userconfig/ansible.cfg b/etc/userconfig/ansible.cfg new file mode 100644 index 00000000..14c80651 --- /dev/null +++ b/etc/userconfig/ansible.cfg @@ -0,0 +1,2 @@ +[defaults] +host_key_checking = False diff --git a/etc/userconfig/hosts.yaml.sample b/etc/userconfig/hosts.yaml.sample new file mode 100644 index 00000000..45f8db3e --- /dev/null +++ b/etc/userconfig/hosts.yaml.sample @@ -0,0 +1,7 @@ +--- +hosts_info: + 192.168.141.101: + - ha-vip + : + - + - diff --git a/etc/userconfig/pod.yaml.sample b/etc/userconfig/pod.yaml.sample new file mode 100644 index 00000000..26636a6b --- /dev/null +++ b/etc/userconfig/pod.yaml.sample @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# sample config file about the POD information, including the +# name/IP/user/ssh key and Controllers/Computes +# +# The options of this config file include: +# name: the name of this node +# role: node's role, support role: Master/Controller/Comupte/BareMetal +# ip: the node's IP address +# user: the username for login +# key_filename:the path of the private key file for login + +nodes: +- + name: node1 + role: Controller + ip: 10.1.0.50 + user: root + key_filename: /root/.ssh/id_rsa +- + name: node2 + role: Controller + ip: 10.1.0.51 + user: root + key_filename: /root/.ssh/id_rsa +- + name: node3 + role: Controller + ip: 10.1.0.52 + user: root + key_filename: /root/.ssh/id_rsa +- + name: node4 + role: Compute + ip: 10.1.0.53 + user: root + key_filename: /root/.ssh/id_rsa +- + name: node5 + role: Compute + ip: 10.1.0.54 + user: root + key_filename: /root/.ssh/id_rsa diff --git a/etc/userconfig/sdnvpn_config_tc000.yaml b/etc/userconfig/sdnvpn_config_tc000.yaml new file mode 100644 index 00000000..1cb4c63f --- /dev/null +++ b/etc/userconfig/sdnvpn_config_tc000.yaml @@ -0,0 +1,7 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + sdnvpn.test.functest.tempest: + enabled: true + description: Neutron BGPVPN tests in tempest diff --git a/etc/userconfig/sdnvpn_config_testcase1.yaml b/etc/userconfig/sdnvpn_config_testcase1.yaml new file mode 100644 index 00000000..5736dcff --- /dev/null +++ b/etc/userconfig/sdnvpn_config_testcase1.yaml @@ -0,0 +1,27 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + sdnvpn.test.functest.testcase_1: + enabled: true + description: VPN provides connectivity between subnets + testname_db: functest_testcase_1 + instance_1_name: sdnvpn-1-1 + instance_2_name: sdnvpn-1-2 + instance_3_name: sdnvpn-1-3 + instance_4_name: sdnvpn-1-4 + instance_5_name: sdnvpn-1-5 + image_name: sdnvpn-image + net_1_name: sdnvpn-1-1-net + subnet_1_name: sdnvpn-1-1-subnet + subnet_1_cidr: 10.10.10.0/24 + router_1_name: sdnvpn-1-1-router + net_2_name: sdnvpn-1-2-net + subnet_2_name: sdnvpn-1-2-subnet + subnet_2_cidr: 10.10.11.0/24 + router_2_name: sdnvpn-1-2-router + secgroup_name: sdnvpn-sg + secgroup_descr: Security group for SDNVPN test cases + targets1: '88:88' + targets2: '55:55' + route_distinguishers: '11:11' diff --git a/etc/userconfig/sdnvpn_config_testcase2.yaml b/etc/userconfig/sdnvpn_config_testcase2.yaml new file mode 100644 index 00000000..2be3bdb5 --- /dev/null +++ b/etc/userconfig/sdnvpn_config_testcase2.yaml @@ -0,0 +1,37 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + sdnvpn.test.functest.testcase_2: + enabled: true + description: Tenant separation + testname_db: functest_testcase_2 + instance_1_name: sdnvpn-2-1 + instance_2_name: sdnvpn-2-2 + instance_3_name: sdnvpn-2-3 + instance_4_name: sdnvpn-2-4 + instance_5_name: sdnvpn-2-5 + instance_1_ip: 10.10.10.11 + instance_2_ip: 10.10.10.12 + instance_3_ip: 10.10.11.13 + instance_4_ip: 10.10.10.12 + instance_5_ip: 10.10.11.13 + image_name: sdnvpn-image + net_1_name: sdnvpn-2-1-net + subnet_1a_name: sdnvpn-2-1a-subnet + subnet_1a_cidr: 10.10.10.0/24 + subnet_1b_name: sdnvpn-2-1b-subnet + subnet_1b_cidr: 10.10.11.0/24 + router_1_name: sdnvpn-2-1-router + net_2_name: sdnvpn-2-2-net + subnet_2a_name: sdnvpn-2-2a-subnet + subnet_2a_cidr: 10.10.11.0/24 + subnet_2b_name: sdnvpn-2-2b-subnet + subnet_2b_cidr: 10.10.10.0/24 + router_2_name: sdnvpn-2-2-router + secgroup_name: sdnvpn-sg + secgroup_descr: Security group for SDNVPN test cases + targets1: '88:88' + targets2: '55:55' + route_distinguishers1: '111:111' + route_distinguishers2: '222:222' diff --git a/etc/userconfig/sdnvpn_config_testcase3.yaml b/etc/userconfig/sdnvpn_config_testcase3.yaml new file mode 100644 index 00000000..c1ffc13b --- /dev/null +++ b/etc/userconfig/sdnvpn_config_testcase3.yaml @@ -0,0 +1,26 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + sdnvpn.test.functest.testcase_3: + enabled: true + description: Data center gateway integration + testname_db: functest_testcase_3 + secgroup_name: sdnvpn-sg + secgroup_descr: Security group for SDNVPN test cases + image_name: sdnvpn-image + ubuntu_image_name: sdnvpn-ubuntu-image + net_1_name: sdnvpn-3-1-net + subnet_1_name: sdnvpn-3-1-subnet + subnet_1_cidr: 10.10.10.0/24 + router_1_name: sdnvpn-3-1-router + quagga_net_name: sdnvpn-3-2-quagga-net + quagga_subnet_name: sdnvpn-3-2-quagga-subnet + quagga_subnet_cidr: 10.10.11.0/24 + quagga_router_name: sdnvpn-3-2-quagga-router + quagga_instance_name: sdnvpn-3-2-quagga + quagga_instance_ip: 10.10.11.5 + instance_1_name: sdnvpn-3-1 + instance_1_ip: 10.10.10.5 + import_targets: '31:31' + export_targets: '32:32' diff --git a/etc/userconfig/sdnvpn_config_testcase4.yaml b/etc/userconfig/sdnvpn_config_testcase4.yaml new file mode 100644 index 00000000..f3f5a56b --- /dev/null +++ b/etc/userconfig/sdnvpn_config_testcase4.yaml @@ -0,0 +1,27 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + sdnvpn.test.functest.testcase_4: + enabled: true + description: VPN provides connectivity between subnets using router association + testname_db: functest_testcase_4 + instance_1_name: sdnvpn-4-1 + instance_2_name: sdnvpn-4-2 + instance_3_name: sdnvpn-4-3 + instance_4_name: sdnvpn-4-4 + instance_5_name: sdnvpn-4-5 + image_name: sdnvpn-image + net_1_name: sdnvpn-4-1-net + subnet_1_name: sdnvpn-4-1-subnet + subnet_1_cidr: 10.10.10.0/24 + router_1_name: sdnvpn-4-1-router + net_2_name: sdnvpn-4-2-net + subnet_2_name: sdnvpn-4-2-subnet + subnet_2_cidr: 10.10.11.0/24 + router_2_name: sdnvpn-4-2-router + secgroup_name: sdnvpn-sg + secgroup_descr: Security group for SDNVPN test cases + targets1: '88:88' + targets2: '55:55' + route_distinguishers: '12:12' diff --git a/etc/userconfig/sdnvpn_config_testcase8.yaml b/etc/userconfig/sdnvpn_config_testcase8.yaml new file mode 100644 index 00000000..8712122b --- /dev/null +++ b/etc/userconfig/sdnvpn_config_testcase8.yaml @@ -0,0 +1,23 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + sdnvpn.test.functest.testcase_8: + enabled: true + description: Test floating IP and router assoc coexistence + testname_db: functest_testcase_8 + image_name: sdnvpn-image + instance_1_name: sdnvpn-8-1 + instance_2_name: sdnvpn-8-2 + net_1_name: sdnvpn-8-1 + subnet_1_name: sdnvpn-8-1-subnet + subnet_1_cidr: 10.10.10.0/24 + router_1_name: sdnvpn-8-1-router + net_2_name: sdnvpn-8-2 + subnet_2_name: sdnvpn-8-2-subnet + subnet_2_cidr: 10.10.20.0/24 + router_2_name: sdnvpn-8-2-router + secgroup_name: sdnvpn-sg + secgroup_descr: Security group for SDNVPN test cases + targets: '88:88' + route_distinguishers: '18:18' diff --git a/etc/userconfig/tempest_conf.yaml.sample b/etc/userconfig/tempest_conf.yaml.sample new file mode 100644 index 00000000..944e3a9f --- /dev/null +++ b/etc/userconfig/tempest_conf.yaml.sample @@ -0,0 +1,16 @@ +# This is an empty configuration file to be filled up with the desired options +# to generate a custom tempest.conf +# Examples: +# network-feature-enabled: +# port_security: True + +# volume-feature-enabled: +# api_v1: False + +# validation: +# image_ssh_user: root +# ssh_timeout: 300 + +# compute: +# min_compute_nodes: 2 +# volume_device_name: vdb diff --git a/etc/userconfig/testcases.yaml b/etc/userconfig/testcases.yaml new file mode 100644 index 00000000..1452a45d --- /dev/null +++ b/etc/userconfig/testcases.yaml @@ -0,0 +1,156 @@ +--- +tiers: + - + name: smoke + order: 1 + ci_loop: '(daily)|(weekly)' + description: >- + Set of basic Functional tests to validate the OPNFV scenarios. + testcases: + - + case_name: vping_ssh + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case verifies: 1) SSH to an instance using + floating IPs over the public network. 2) Connectivity + between 2 instances over a private network. + dependencies: + installer: '' + scenario: '' + run: + module: 'functest.opnfv_tests.openstack.vping.vping_ssh' + class: 'VPingSSH' + + - + case_name: vping_userdata + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case verifies: 1) Boot a VM with given userdata. + 2) Connectivity between 2 instances over a private network. + dependencies: + installer: '' + scenario: '' + run: + module: + 'functest.opnfv_tests.openstack.vping.vping_userdata' + class: 'VPingUserdata' + + - + case_name: refstack_defcore + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs a sub group of tests of the OpenStack + Defcore testcases by using refstack client. + dependencies: + installer: '' + scenario: '' + run: + module: + 'functest.opnfv_tests.openstack.refstack_client.refstack_client' + class: 'RefstackClient' + + - + case_name: tempest_smoke_serial + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the smoke subset of the OpenStack + Tempest suite. The list of test cases is generated by + Tempest automatically and depends on the parameters of + the OpenStack deplopyment. + dependencies: + installer: '' + scenario: '' + run: + module: 'functest.opnfv_tests.openstack.tempest.tempest' + class: 'TempestSmokeSerial' + + - + case_name: snaps_smoke + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case contains tests that setup and destroy + environments with VMs with and without Floating IPs + with a newly created user and project. Set the config + value snaps.use_floating_ips (True|False) to toggle + this functionality. When the config value of + snaps.use_keystone is True, functest must have access to + the cloud's private network. + dependencies: + installer: '' + scenario: '' + run: + module: 'functest.opnfv_tests.openstack.snaps.smoke' + class: 'SnapsSmoke' + + - + case_name: tempest_custom + project_name: functest + criteria: 100 + blocking: false + description: >- + The test case allows running a customized list of tempest + test cases defined in a file under + /functest/opnfv_tests/openstack/ + /tempest/custom_tests/test_list.txt + The file is empty and can be customized with the desired tests. + dependencies: + installer: '' + scenario: '' + run: + module: 'functest.opnfv_tests.openstack.tempest.tempest' + class: 'TempestCustom' + + - + name: features + order: 2 + ci_loop: '(daily)|(weekly)' + description: >- + Test suites from feature projects + integrated in functest + testcases: + - + case_name: bgpvpn + project_name: sdnvpn + criteria: 100 + blocking: false + description: >- + Test suite from SDNVPN project. + dependencies: + installer: '' + scenario: '' + run: + module: 'sdnvpn.test.functest.run_sdnvpn_tests' + class: 'SdnvpnFunctest' + + - + name: vnf + order: 4 + ci_loop: '(daily)|(weekly)' + description: >- + Collection of VNF test cases. + testcases: + - + case_name: cloudify_ims + project_name: functest + criteria: 80 + blocking: false + description: >- + This test case deploys an OpenSource vIMS solution from + Clearwater using the Cloudify orchestrator. It also runs + some signaling traffic. + dependencies: + installer: '' + scenario: '' + run: + module: 'functest.opnfv_tests.vnf.ims.cloudify_ims' + class: 'CloudifyIms' -- cgit 1.2.3-korg