summaryrefslogtreecommitdiffstats
path: root/etc/userconfig
diff options
context:
space:
mode:
Diffstat (limited to 'etc/userconfig')
-rw-r--r--etc/userconfig/ansible.cfg9
-rw-r--r--etc/userconfig/bgpvpn_testcases.yaml18
-rw-r--r--etc/userconfig/env_config.sh.onap.sample22
-rw-r--r--etc/userconfig/env_config.sh.sample9
-rw-r--r--etc/userconfig/hosts.yaml.sample9
-rw-r--r--etc/userconfig/patrole_blacklist.yaml37
-rw-r--r--etc/userconfig/rally_authenticate_testcases.yaml31
-rw-r--r--etc/userconfig/rally_cinder_testcases.yaml31
-rw-r--r--etc/userconfig/rally_glance_testcases.yaml31
-rw-r--r--etc/userconfig/rally_gnocchi_testcases.yaml31
-rw-r--r--etc/userconfig/rally_heat_testcases.yaml31
-rw-r--r--etc/userconfig/rally_keystone_testcases.yaml31
-rw-r--r--etc/userconfig/rally_neutron_testcases.yaml31
-rw-r--r--etc/userconfig/rally_nova_testcases.yaml31
-rw-r--r--etc/userconfig/rally_quotas_testcases.yaml31
-rw-r--r--etc/userconfig/sdnvpn_config_tc000.yaml7
-rw-r--r--etc/userconfig/sdnvpn_config_testcase1.yaml27
-rw-r--r--etc/userconfig/sdnvpn_config_testcase2.yaml37
-rw-r--r--etc/userconfig/sdnvpn_config_testcase3.yaml26
-rw-r--r--etc/userconfig/sdnvpn_config_testcase4.yaml27
-rw-r--r--etc/userconfig/sdnvpn_config_testcase8.yaml23
-rw-r--r--etc/userconfig/tempest_conf.yaml.sample9
-rw-r--r--etc/userconfig/tempest_custom_testcases.yaml9
-rw-r--r--etc/userconfig/testcases.yaml9
-rw-r--r--etc/userconfig/trunk_port_blacklist.yaml28
-rw-r--r--etc/userconfig/vnf_descriptor.yaml.sample20
-rw-r--r--etc/userconfig/vnf_testcases.yaml9
-rw-r--r--etc/userconfig/vnftest_conf.yaml36
28 files changed, 429 insertions, 221 deletions
diff --git a/etc/userconfig/ansible.cfg b/etc/userconfig/ansible.cfg
index 14c80651..15e9c250 100644
--- a/etc/userconfig/ansible.cfg
+++ b/etc/userconfig/ansible.cfg
@@ -1,2 +1,11 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
[defaults]
host_key_checking = False
diff --git a/etc/userconfig/bgpvpn_testcases.yaml b/etc/userconfig/bgpvpn_testcases.yaml
deleted file mode 100644
index cadfe025..00000000
--- a/etc/userconfig/bgpvpn_testcases.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-tiers:
- -
- name: features
- order: 2
- 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.
- run:
- name: bgpvpn
diff --git a/etc/userconfig/env_config.sh.onap.sample b/etc/userconfig/env_config.sh.onap.sample
new file mode 100644
index 00000000..81363e48
--- /dev/null
+++ b/etc/userconfig/env_config.sh.onap.sample
@@ -0,0 +1,22 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+## Special environment parameters for TOSCA validation tests.
+
+# The url under which the VNF SDK container is accessible through the host.
+export HOST_URL="http://<docker host ip>:8702"
+
+# Absolute path of the CSAR file in container 'refrepo'.
+export CSAR_FILE="/opt/test.csar"
+
+## Special environment parameters for Heat validation tests.
+
+# The VNF archive should be zip file and put at $DOVETAIL_HOME/pre_config.
+# Here should give the name without postfix .zip.
+export VNF_ARCHIVE_NAME="vnf_archive_name"
diff --git a/etc/userconfig/env_config.sh.sample b/etc/userconfig/env_config.sh.sample
index f39d8d05..3909427e 100644
--- a/etc/userconfig/env_config.sh.sample
+++ b/etc/userconfig/env_config.sh.sample
@@ -1,3 +1,12 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
# Project-level authentication scope (name or ID), recommend admin project.
export OS_PROJECT_NAME=admin
diff --git a/etc/userconfig/hosts.yaml.sample b/etc/userconfig/hosts.yaml.sample
index 45f8db3e..445711db 100644
--- a/etc/userconfig/hosts.yaml.sample
+++ b/etc/userconfig/hosts.yaml.sample
@@ -1,3 +1,12 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
---
hosts_info:
192.168.141.101:
diff --git a/etc/userconfig/patrole_blacklist.yaml b/etc/userconfig/patrole_blacklist.yaml
new file mode 100644
index 00000000..8fb99fee
--- /dev/null
+++ b/etc/userconfig/patrole_blacklist.yaml
@@ -0,0 +1,37 @@
+---
+-
+ scenarios:
+ - (.*)
+ tests:
+ # need metering extension, otherwise the following 6 sub test cases will skip
+ - patrole_tempest_plugin.tests.api.network.test_metering_label_rules_rbac.MeteringLabelRulesRbacTest.test_create_metering_label_rule
+ - patrole_tempest_plugin.tests.api.network.test_metering_label_rules_rbac.MeteringLabelRulesRbacTest.test_delete_metering_label_rule
+ - patrole_tempest_plugin.tests.api.network.test_metering_label_rules_rbac.MeteringLabelRulesRbacTest.test_show_metering_label_rule
+ - patrole_tempest_plugin.tests.api.network.test_metering_labels_rbac.MeteringLabelsRbacTest.test_create_metering_label
+ - patrole_tempest_plugin.tests.api.network.test_metering_labels_rbac.MeteringLabelsRbacTest.test_delete_metering_label
+ - patrole_tempest_plugin.tests.api.network.test_metering_labels_rbac.MeteringLabelsRbacTest.test_show_metering_label
+ # need image type 'shared' and 'community' which were added in the Image API v2.5
+ - patrole_tempest_plugin.tests.api.image.test_images_member_rbac.ImagesMemberRbacTest.test_update_image_member
+ - patrole_tempest_plugin.tests.api.image.test_images_rbac.BasicOperationsImagesRbacTest.test_communitize_image
+ # need l3_agent_scheduler extension which may not enabled on some SUTs with odl
+ - patrole_tempest_plugin.tests.api.network.test_agents_rbac.L3AgentSchedulerRbacTest.test_create_router_on_l3_agent
+ - patrole_tempest_plugin.tests.api.network.test_agents_rbac.L3AgentSchedulerRbacTest.test_delete_router_from_l3_agent
+ - patrole_tempest_plugin.tests.api.network.test_agents_rbac.L3AgentSchedulerRbacTest.test_list_routers_on_l3_agent
+ # need network extension: dvr, otherwise the following 3 sub test cases will skip
+ - patrole_tempest_plugin.tests.api.network.test_routers_rbac.RouterRbacTest.test_create_distributed_router
+ - patrole_tempest_plugin.tests.api.network.test_routers_rbac.RouterRbacTest.test_show_distributed_router
+ - patrole_tempest_plugin.tests.api.network.test_routers_rbac.RouterRbacTest.test_update_distributed_router
+ # need network extension: l3-ha which may not enabled on some SUTs with odl
+ - patrole_tempest_plugin.tests.api.network.test_routers_rbac.RouterRbacTest.test_create_high_availability_router
+ - patrole_tempest_plugin.tests.api.network.test_routers_rbac.RouterRbacTest.test_update_high_availability_router
+ # need segment extension, otherwise the following 4 sub test cases will skip
+ - patrole_tempest_plugin.tests.api.network.test_segments_rbac.SegmentsPluginRbacTest.test_create_segment
+ - patrole_tempest_plugin.tests.api.network.test_segments_rbac.SegmentsPluginRbacTest.test_delete_segment
+ - patrole_tempest_plugin.tests.api.network.test_segments_rbac.SegmentsPluginRbacTest.test_show_segment
+ - patrole_tempest_plugin.tests.api.network.test_segments_rbac.SegmentsPluginRbacTest.test_update_segment
+ # need flat provider network type
+ - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_physical_network
+ # need vxlan provider network type
+ - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_update_network_provider_network_type
+ - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type
+ - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id
diff --git a/etc/userconfig/rally_authenticate_testcases.yaml b/etc/userconfig/rally_authenticate_testcases.yaml
new file mode 100644
index 00000000..e2e67446
--- /dev/null
+++ b/etc/userconfig/rally_authenticate_testcases.yaml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+---
+tiers:
+ -
+ name: components
+ order: 1
+ description: >-
+ Run several OpenStack performance tools
+ https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+ testcases:
+ -
+ case_name: rally_full
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs the Authenticate scenarios of the
+ OpenStack Rally suite using several threads and iterations.
+ run:
+ name: rally_full
+ args:
+ tests:
+ - 'authenticate'
diff --git a/etc/userconfig/rally_cinder_testcases.yaml b/etc/userconfig/rally_cinder_testcases.yaml
new file mode 100644
index 00000000..245b1285
--- /dev/null
+++ b/etc/userconfig/rally_cinder_testcases.yaml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+---
+tiers:
+ -
+ name: components
+ order: 1
+ description: >-
+ Run several OpenStack performance tools
+ https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+ testcases:
+ -
+ case_name: rally_full
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs the Cinder scenarios of the
+ OpenStack Rally suite using several threads and iterations.
+ run:
+ name: rally_full
+ args:
+ tests:
+ - 'cinder'
diff --git a/etc/userconfig/rally_glance_testcases.yaml b/etc/userconfig/rally_glance_testcases.yaml
new file mode 100644
index 00000000..abaead70
--- /dev/null
+++ b/etc/userconfig/rally_glance_testcases.yaml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+---
+tiers:
+ -
+ name: components
+ order: 1
+ description: >-
+ Run several OpenStack performance tools
+ https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+ testcases:
+ -
+ case_name: rally_full
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs the Glance scenarios of the
+ OpenStack Rally suite using several threads and iterations.
+ run:
+ name: rally_full
+ args:
+ tests:
+ - 'glance'
diff --git a/etc/userconfig/rally_gnocchi_testcases.yaml b/etc/userconfig/rally_gnocchi_testcases.yaml
new file mode 100644
index 00000000..378b5f59
--- /dev/null
+++ b/etc/userconfig/rally_gnocchi_testcases.yaml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+---
+tiers:
+ -
+ name: components
+ order: 1
+ description: >-
+ Run several OpenStack performance tools
+ https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+ testcases:
+ -
+ case_name: rally_full
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs the Gnocchi scenarios of the
+ OpenStack Rally suite using several threads and iterations.
+ run:
+ name: rally_full
+ args:
+ tests:
+ - 'gnocchi'
diff --git a/etc/userconfig/rally_heat_testcases.yaml b/etc/userconfig/rally_heat_testcases.yaml
new file mode 100644
index 00000000..311d4f3f
--- /dev/null
+++ b/etc/userconfig/rally_heat_testcases.yaml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+---
+tiers:
+ -
+ name: components
+ order: 1
+ description: >-
+ Run several OpenStack performance tools
+ https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+ testcases:
+ -
+ case_name: rally_full
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs the Heat scenarios of the
+ OpenStack Rally suite using several threads and iterations.
+ run:
+ name: rally_full
+ args:
+ tests:
+ - 'heat'
diff --git a/etc/userconfig/rally_keystone_testcases.yaml b/etc/userconfig/rally_keystone_testcases.yaml
new file mode 100644
index 00000000..6a60ca7c
--- /dev/null
+++ b/etc/userconfig/rally_keystone_testcases.yaml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+---
+tiers:
+ -
+ name: components
+ order: 1
+ description: >-
+ Run several OpenStack performance tools
+ https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+ testcases:
+ -
+ case_name: rally_full
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs the Keystone scenarios of the
+ OpenStack Rally suite using several threads and iterations.
+ run:
+ name: rally_full
+ args:
+ tests:
+ - 'keystone'
diff --git a/etc/userconfig/rally_neutron_testcases.yaml b/etc/userconfig/rally_neutron_testcases.yaml
new file mode 100644
index 00000000..66a7b030
--- /dev/null
+++ b/etc/userconfig/rally_neutron_testcases.yaml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+---
+tiers:
+ -
+ name: components
+ order: 1
+ description: >-
+ Run several OpenStack performance tools
+ https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+ testcases:
+ -
+ case_name: rally_full
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs the Neutron scenarios of the
+ OpenStack Rally suite using several threads and iterations.
+ run:
+ name: rally_full
+ args:
+ tests:
+ - 'neutron'
diff --git a/etc/userconfig/rally_nova_testcases.yaml b/etc/userconfig/rally_nova_testcases.yaml
new file mode 100644
index 00000000..8c54de21
--- /dev/null
+++ b/etc/userconfig/rally_nova_testcases.yaml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+---
+tiers:
+ -
+ name: components
+ order: 1
+ description: >-
+ Run several OpenStack performance tools
+ https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+ testcases:
+ -
+ case_name: rally_full
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs the Nova scenarios of the
+ OpenStack Rally suite using several threads and iterations.
+ run:
+ name: rally_full
+ args:
+ tests:
+ - 'nova'
diff --git a/etc/userconfig/rally_quotas_testcases.yaml b/etc/userconfig/rally_quotas_testcases.yaml
new file mode 100644
index 00000000..add0cca5
--- /dev/null
+++ b/etc/userconfig/rally_quotas_testcases.yaml
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
+---
+tiers:
+ -
+ name: components
+ order: 1
+ description: >-
+ Run several OpenStack performance tools
+ https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+ testcases:
+ -
+ case_name: rally_full
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs the Quotas scenarios of the
+ OpenStack Rally suite using several threads and iterations.
+ run:
+ name: rally_full
+ args:
+ tests:
+ - 'quotas'
diff --git a/etc/userconfig/sdnvpn_config_tc000.yaml b/etc/userconfig/sdnvpn_config_tc000.yaml
deleted file mode 100644
index 80f1b5d9..00000000
--- a/etc/userconfig/sdnvpn_config_tc000.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-defaults:
- flavor: m1.tiny # adapt to your environment
-
-testcases:
- sdnvpn.test.functest.run_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
deleted file mode 100644
index 5736dcff..00000000
--- a/etc/userconfig/sdnvpn_config_testcase1.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 2be3bdb5..00000000
--- a/etc/userconfig/sdnvpn_config_testcase2.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644
index c1ffc13b..00000000
--- a/etc/userconfig/sdnvpn_config_testcase3.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index f3f5a56b..00000000
--- a/etc/userconfig/sdnvpn_config_testcase4.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 8712122b..00000000
--- a/etc/userconfig/sdnvpn_config_testcase8.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-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
index 944e3a9f..43a2a76b 100644
--- a/etc/userconfig/tempest_conf.yaml.sample
+++ b/etc/userconfig/tempest_conf.yaml.sample
@@ -1,3 +1,12 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
# This is an empty configuration file to be filled up with the desired options
# to generate a custom tempest.conf
# Examples:
diff --git a/etc/userconfig/tempest_custom_testcases.yaml b/etc/userconfig/tempest_custom_testcases.yaml
index 5821a6ff..03170b40 100644
--- a/etc/userconfig/tempest_custom_testcases.yaml
+++ b/etc/userconfig/tempest_custom_testcases.yaml
@@ -1,3 +1,12 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
---
tiers:
-
diff --git a/etc/userconfig/testcases.yaml b/etc/userconfig/testcases.yaml
index 44b99bb1..440807bb 100644
--- a/etc/userconfig/testcases.yaml
+++ b/etc/userconfig/testcases.yaml
@@ -1,3 +1,12 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
---
tiers:
-
diff --git a/etc/userconfig/trunk_port_blacklist.yaml b/etc/userconfig/trunk_port_blacklist.yaml
new file mode 100644
index 00000000..bf4cfe08
--- /dev/null
+++ b/etc/userconfig/trunk_port_blacklist.yaml
@@ -0,0 +1,28 @@
+---
+-
+ scenarios:
+ - (.*)
+ tests:
+ # need VLAN type driver, otherwise the following 1 sub test case will skip
+ - neutron_tempest_plugin.api.test_trunk.TrunkTestInheritJSONBase.test_add_subport
+ # need vxlan type driver, otherwise the following 1 sub test case will skip
+ - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_subport_invalid_inherit_network_segmentation_type
+ # need vxlan or gre type driver, otherwise the following 6 sub test case will skip
+ - neutron_tempest_plugin.api.test_trunk.TrunkTestMtusJSON.test_add_subport_with_mtu_equal_to_trunk
+ - neutron_tempest_plugin.api.test_trunk.TrunkTestMtusJSON.test_add_subport_with_mtu_greater_than_subport
+ - neutron_tempest_plugin.api.test_trunk.TrunkTestMtusJSON.test_create_trunk_with_mtu_equal_to_subport
+ - neutron_tempest_plugin.api.test_trunk.TrunkTestMtusJSON.test_create_trunk_with_mtu_greater_than_subport
+ - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestMtusJSON.test_add_subport_with_mtu_greater_than_trunk
+ - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestMtusJSON.test_create_trunk_with_mtu_smaller_than_subport
+ # advanced image is required to run this test, otherwise the following 2 sub test case will skip
+ - neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_parent_port_connectivity_after_trunk_deleted_lb
+ - neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_subport_connectivity
+ # key 'revision_number' is a new extension for Newton and not support by Mitaka
+ - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_create_update_trunk
+ # extension 'project-id' is a new extension for Newton
+ - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_show_trunk_has_project_id
+ # Can not work correctly on Mitaka
+ - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_create_update_trunk_with_description
+ # Remove neutron trunk test cases with href links
+ - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_page_reverse_with_href_links
+ - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_with_href_links
diff --git a/etc/userconfig/vnf_descriptor.yaml.sample b/etc/userconfig/vnf_descriptor.yaml.sample
deleted file mode 100644
index 98741768..00000000
--- a/etc/userconfig/vnf_descriptor.yaml.sample
+++ /dev/null
@@ -1,20 +0,0 @@
-##############################################################################
-# Copyright 2018 EuropeanSoftwareMarketingLtd.
-# ===================================================================
-# Licensed under the ApacheLicense, Version2.0 (the"License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# software distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under
-# the License
-##############################################################################
-
----
-
-vnf_name: sample_firewall
-type: CSAR
-vnf_id: 123456
-csar_package_location: /home/opnfv/userconfig/pre_config/vFW_sample.csar \ No newline at end of file
diff --git a/etc/userconfig/vnf_testcases.yaml b/etc/userconfig/vnf_testcases.yaml
index fbf91ca6..21586ab6 100644
--- a/etc/userconfig/vnf_testcases.yaml
+++ b/etc/userconfig/vnf_testcases.yaml
@@ -1,3 +1,12 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# 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
+##############################################################################
+
---
tiers:
-
diff --git a/etc/userconfig/vnftest_conf.yaml b/etc/userconfig/vnftest_conf.yaml
deleted file mode 100644
index 781540bd..00000000
--- a/etc/userconfig/vnftest_conf.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-##############################################################################
-# Copyright 2018 EuropeanSoftwareMarketingLtd.
-# ===================================================================
-# Licensed under the ApacheLicense, Version2.0 (the"License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# software distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and limitations under
-# the License
-##############################################################################
-
-dir:
- conf: /etc/nvftest
- repos: /home/vnftest/repos/vnftest
- log: /tmp/vnftest
-
-file:
- output_file: /tmp/vnftest.out
- html_file: /tmp/vnftest.htm
- reporting_file: /tmp/report.html
-
-component:
- aai_ip: 10.247.43.140
- aai_port: 30202
- aai_ssl_port: 30233
- mso_ip: 10.247.43.140
- sdc_ip: 10.247.43.140
- sdc_port: 30205
- sdc_catalog_port: 30206
- sdc_designer_user: cs0008
- sdc_tester_user: jm0007
- sdc_governance_user: gv0001
- sdc_operations_user: op0001 \ No newline at end of file