diff options
author | xudan <xudan16@huawei.com> | 2017-06-22 00:04:51 -0400 |
---|---|---|
committer | xudan <xudan16@huawei.com> | 2017-06-22 00:04:51 -0400 |
commit | 21563d9f2ed1da2161e23769da090ba8320c6d7f (patch) | |
tree | 22893eecc2fd8ab8df03d7c3b598f438e17d30f2 /dovetail/userconfig | |
parent | 9de3050873909448d675a47326cd4f153a47bef2 (diff) |
Bugfix: Move userconfig directory into dovetail/dovetail
JITA: DOVETAIL-449
1. Dovetail cvp.0.1.0 link dovetail/dovetail to
/usr/local/lib/python2.7/dist-packages/dovetail/
2. The directory dovetail/userconfig is lost in this image
3. Move dovetail/userconfig into dovetail/dovetail/userconfig
Change-Id: I9da8389e02d92f35879ff5c6a1db1b7d984dd862
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/userconfig')
-rw-r--r-- | dovetail/userconfig/hosts.yaml | 2 | ||||
-rw-r--r-- | dovetail/userconfig/pod.yaml.sample | 50 | ||||
-rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase1.yaml | 33 | ||||
-rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase2.yaml | 43 | ||||
-rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase3.yaml | 32 | ||||
-rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase4.yaml | 33 | ||||
-rw-r--r-- | dovetail/userconfig/sdnvpn_config_testcase8.yaml | 29 |
7 files changed, 222 insertions, 0 deletions
diff --git a/dovetail/userconfig/hosts.yaml b/dovetail/userconfig/hosts.yaml new file mode 100644 index 00000000..e4687dfb --- /dev/null +++ b/dovetail/userconfig/hosts.yaml @@ -0,0 +1,2 @@ +--- +hosts_info: diff --git a/dovetail/userconfig/pod.yaml.sample b/dovetail/userconfig/pod.yaml.sample new file mode 100644 index 00000000..26636a6b --- /dev/null +++ b/dovetail/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/dovetail/userconfig/sdnvpn_config_testcase1.yaml b/dovetail/userconfig/sdnvpn_config_testcase1.yaml new file mode 100644 index 00000000..d9e4a1b4 --- /dev/null +++ b/dovetail/userconfig/sdnvpn_config_testcase1.yaml @@ -0,0 +1,33 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + tempest: + enabled: true + description: Neutron BGPVPN tests in tempest + testname_db: functest_tempest # declared name in the test api + # http://testresults.opnfv.org/test/api/v1/projects/sdnvpn/cases + + 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/dovetail/userconfig/sdnvpn_config_testcase2.yaml b/dovetail/userconfig/sdnvpn_config_testcase2.yaml new file mode 100644 index 00000000..07b0adfa --- /dev/null +++ b/dovetail/userconfig/sdnvpn_config_testcase2.yaml @@ -0,0 +1,43 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + tempest: + enabled: true + description: Neutron BGPVPN tests in tempest + testname_db: functest_tempest # declared name in the test api + # http://testresults.opnfv.org/test/api/v1/projects/sdnvpn/cases + + 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/dovetail/userconfig/sdnvpn_config_testcase3.yaml b/dovetail/userconfig/sdnvpn_config_testcase3.yaml new file mode 100644 index 00000000..60592cbb --- /dev/null +++ b/dovetail/userconfig/sdnvpn_config_testcase3.yaml @@ -0,0 +1,32 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + tempest: + enabled: true + description: Neutron BGPVPN tests in tempest + testname_db: functest_tempest # declared name in the test api + # http://testresults.opnfv.org/test/api/v1/projects/sdnvpn/cases + + 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/dovetail/userconfig/sdnvpn_config_testcase4.yaml b/dovetail/userconfig/sdnvpn_config_testcase4.yaml new file mode 100644 index 00000000..1e221354 --- /dev/null +++ b/dovetail/userconfig/sdnvpn_config_testcase4.yaml @@ -0,0 +1,33 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + tempest: + enabled: true + description: Neutron BGPVPN tests in tempest + testname_db: functest_tempest # declared name in the test api + # http://testresults.opnfv.org/test/api/v1/projects/sdnvpn/cases + + 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/dovetail/userconfig/sdnvpn_config_testcase8.yaml b/dovetail/userconfig/sdnvpn_config_testcase8.yaml new file mode 100644 index 00000000..c825997b --- /dev/null +++ b/dovetail/userconfig/sdnvpn_config_testcase8.yaml @@ -0,0 +1,29 @@ +defaults: + flavor: m1.tiny # adapt to your environment + +testcases: + tempest: + enabled: true + description: Neutron BGPVPN tests in tempest + testname_db: functest_tempest # declared name in the test api + # http://testresults.opnfv.org/test/api/v1/projects/sdnvpn/cases + + 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' |