From c5162f01bb54eab6b3c4056074e28e0080dc4d08 Mon Sep 17 00:00:00 2001 From: yuyang Date: Mon, 20 Feb 2017 11:28:17 +0800 Subject: Add liscense to file headers JIRA: BOTTLENECK-133 Some Yaml, XML and __init__.py file do not have liscense headers. This patch is to add headers to those files or delete those are deprecated. Change-Id: Ie059b1f1879eb420eec171f96985247510c74642 Signed-off-by: yuyang --- testsuites/__init__.py | 9 - testsuites/posca/__init__.py | 8 - testsuites/posca/testcase_cfg/__init__.py | 9 - .../testcase_cfg/posca_factor_cpu_burden.yaml | 9 + .../testcase_cfg/posca_factor_rx_cache_size.yaml | 9 + .../testcase_cfg/posca_factor_rx_pkt_size.yaml | 9 + .../posca_factor_system_bandwidth.yaml | 9 + .../testcase_cfg/posca_factor_tx_cache_size.yaml | 9 + .../testcase_cfg/posca_factor_tx_pkt_size.yaml | 9 + .../posca/testcase_cfg/posca_stress_ping.yaml | 9 + testsuites/posca/testcase_script/__init__.py | 8 - testsuites/posca/testsuite_story/__init__.py | 9 - .../modules/rubbos_tomcat/files/server.xml | 38 -- .../rubbos_tomcat/files/tomcat_sl/Config.java | 35 -- .../rubbos_tomcat/files/tomcat_sl/build.xml | 82 ---- .../modules/rubbos_tomcat/files/tomcat_sl/web.xml | 199 --------- testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml | 350 --------------- .../rubbos_scripts/1-1-1/rubbos_conf/Config.java | 34 -- .../rubbos_scripts/1-1-1/rubbos_conf/build.xml | 114 ----- .../rubbos_scripts/1-1-1/rubbos_conf/web.xml | 203 --------- .../rubbos_scripts/1-1-1/tomcat_conf/server.xml | 79 ---- .../rubbos/testcase_cfg/rubbos-heavy_1-1-0-1.yaml | 470 --------------------- testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml | 327 -------------- testsuites/rubbos/testcase_cfg/rubbos_1-2-0-1.yaml | 350 --------------- testsuites/rubbos/testcase_cfg/rubbos_1-3-0-1.yaml | 374 ---------------- testsuites/rubbos/testcase_cfg/rubbos_1-4-0-1.yaml | 398 ----------------- testsuites/rubbos/testcase_cfg/rubbos_basic.yaml | 227 ---------- testsuites/vstf/testcase_cfg/vstf_Ti1.yaml | 9 + testsuites/vstf/testcase_cfg/vstf_Ti2.yaml | 9 + testsuites/vstf/testcase_cfg/vstf_Ti3.yaml | 9 + testsuites/vstf/testcase_cfg/vstf_Tn1.yaml | 9 + testsuites/vstf/testcase_cfg/vstf_Tn2.yaml | 11 +- testsuites/vstf/testcase_cfg/vstf_Tu1.yaml | 9 + testsuites/vstf/testcase_cfg/vstf_Tu2.yaml | 9 + testsuites/vstf/testcase_cfg/vstf_Tu3.yaml | 9 + .../vstf/testcase_cfg/vstf_heat_template.yaml | 9 + 36 files changed, 145 insertions(+), 3324 deletions(-) mode change 100755 => 100644 testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/server.xml delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/Config.java delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.xml delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/web.xml delete mode 100644 testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml delete mode 100644 testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java delete mode 100644 testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml delete mode 100644 testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml delete mode 100644 testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml delete mode 100644 testsuites/rubbos/testcase_cfg/rubbos-heavy_1-1-0-1.yaml delete mode 100755 testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml delete mode 100644 testsuites/rubbos/testcase_cfg/rubbos_1-2-0-1.yaml delete mode 100644 testsuites/rubbos/testcase_cfg/rubbos_1-3-0-1.yaml delete mode 100644 testsuites/rubbos/testcase_cfg/rubbos_1-4-0-1.yaml delete mode 100644 testsuites/rubbos/testcase_cfg/rubbos_basic.yaml mode change 100755 => 100644 testsuites/vstf/testcase_cfg/vstf_Ti1.yaml mode change 100755 => 100644 testsuites/vstf/testcase_cfg/vstf_Ti2.yaml mode change 100755 => 100644 testsuites/vstf/testcase_cfg/vstf_Ti3.yaml mode change 100755 => 100644 testsuites/vstf/testcase_cfg/vstf_Tn1.yaml mode change 100755 => 100644 testsuites/vstf/testcase_cfg/vstf_Tn2.yaml mode change 100755 => 100644 testsuites/vstf/testcase_cfg/vstf_Tu1.yaml mode change 100755 => 100644 testsuites/vstf/testcase_cfg/vstf_Tu2.yaml mode change 100755 => 100644 testsuites/vstf/testcase_cfg/vstf_Tu3.yaml mode change 100755 => 100644 testsuites/vstf/testcase_cfg/vstf_heat_template.yaml (limited to 'testsuites') diff --git a/testsuites/__init__.py b/testsuites/__init__.py index efcda782..e69de29b 100644 --- a/testsuites/__init__.py +++ b/testsuites/__init__.py @@ -1,9 +0,0 @@ -############################################################################## -# 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 -############################################################################## - diff --git a/testsuites/posca/__init__.py b/testsuites/posca/__init__.py index b124dfa9..e69de29b 100644 --- a/testsuites/posca/__init__.py +++ b/testsuites/posca/__init__.py @@ -1,8 +0,0 @@ -############################################################################## -# 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 -############################################################################## diff --git a/testsuites/posca/testcase_cfg/__init__.py b/testsuites/posca/testcase_cfg/__init__.py index efcda782..e69de29b 100644 --- a/testsuites/posca/testcase_cfg/__init__.py +++ b/testsuites/posca/testcase_cfg/__init__.py @@ -1,9 +0,0 @@ -############################################################################## -# 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 -############################################################################## - diff --git a/testsuites/posca/testcase_cfg/posca_factor_cpu_burden.yaml b/testsuites/posca/testcase_cfg/posca_factor_cpu_burden.yaml index fb4dcba9..5b97b9e1 100644 --- a/testsuites/posca/testcase_cfg/posca_factor_cpu_burden.yaml +++ b/testsuites/posca/testcase_cfg/posca_factor_cpu_burden.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + [config] test_ip: dashboard: y diff --git a/testsuites/posca/testcase_cfg/posca_factor_rx_cache_size.yaml b/testsuites/posca/testcase_cfg/posca_factor_rx_cache_size.yaml index 2dfb1fe8..0cee6859 100644 --- a/testsuites/posca/testcase_cfg/posca_factor_rx_cache_size.yaml +++ b/testsuites/posca/testcase_cfg/posca_factor_rx_cache_size.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + [config] test_ip: 192.168.23.2:8888 throughput: 1000 diff --git a/testsuites/posca/testcase_cfg/posca_factor_rx_pkt_size.yaml b/testsuites/posca/testcase_cfg/posca_factor_rx_pkt_size.yaml index 86068b8a..b94aa710 100644 --- a/testsuites/posca/testcase_cfg/posca_factor_rx_pkt_size.yaml +++ b/testsuites/posca/testcase_cfg/posca_factor_rx_pkt_size.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + [config] test_ip: 192.168.23.2:8888 throughput: 1000 diff --git a/testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml b/testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml old mode 100755 new mode 100644 index dcea7275..de2966b7 --- a/testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml +++ b/testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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 +############################################################################## + test_config: tool: netperf protocol: tcp diff --git a/testsuites/posca/testcase_cfg/posca_factor_tx_cache_size.yaml b/testsuites/posca/testcase_cfg/posca_factor_tx_cache_size.yaml index f2379bcc..9b69c105 100644 --- a/testsuites/posca/testcase_cfg/posca_factor_tx_cache_size.yaml +++ b/testsuites/posca/testcase_cfg/posca_factor_tx_cache_size.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + [config] test_ip: 192.168.23.2:8888 throughput: 1000 diff --git a/testsuites/posca/testcase_cfg/posca_factor_tx_pkt_size.yaml b/testsuites/posca/testcase_cfg/posca_factor_tx_pkt_size.yaml index dcceee02..06b07796 100644 --- a/testsuites/posca/testcase_cfg/posca_factor_tx_pkt_size.yaml +++ b/testsuites/posca/testcase_cfg/posca_factor_tx_pkt_size.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + [config] test_ip: 192.168.23.2:8888 throughput: 1000 diff --git a/testsuites/posca/testcase_cfg/posca_stress_ping.yaml b/testsuites/posca/testcase_cfg/posca_stress_ping.yaml index 75eba97d..7e6bf027 100644 --- a/testsuites/posca/testcase_cfg/posca_stress_ping.yaml +++ b/testsuites/posca/testcase_cfg/posca_stress_ping.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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 stress task config file # Three scenarios run in parallel pinging one target vm. # Multiple context are used to specify the host and target VMs. diff --git a/testsuites/posca/testcase_script/__init__.py b/testsuites/posca/testcase_script/__init__.py index 83b8d15d..e69de29b 100644 --- a/testsuites/posca/testcase_script/__init__.py +++ b/testsuites/posca/testcase_script/__init__.py @@ -1,8 +0,0 @@ -############################################################################## -# Copyright (c) 2015 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 -############################################################################## diff --git a/testsuites/posca/testsuite_story/__init__.py b/testsuites/posca/testsuite_story/__init__.py index efcda782..e69de29b 100644 --- a/testsuites/posca/testsuite_story/__init__.py +++ b/testsuites/posca/testsuite_story/__init__.py @@ -1,9 +0,0 @@ -############################################################################## -# 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 -############################################################################## - diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/server.xml b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/server.xml deleted file mode 100644 index 43ef7c07..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/server.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/Config.java b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/Config.java deleted file mode 100644 index dc3fb32f..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/Config.java +++ /dev/null @@ -1,35 +0,0 @@ -package edu.rice.rubbos.servlets; - - -public class Config -{ - - /** - * Creates a new Config instance. - */ - Config() - { - } - - - public static final String HTMLFilesPath = "REPLACED_RUBBOS_HOME/Servlet_HTML"; - public static final String DatabaseProperties = "REPLACED_RUBBOS_HOME/Servlets/mysql.properties"; - public static final int DatabasePropertiesSize = 1; - - public static final int AboutMePoolSize = 10; - public static final int BrowseCategoriesPoolSize = 6; - public static final int BrowseRegionsPoolSize = 6; - public static final int BuyNowPoolSize = 4; - public static final int PutBidPoolSize = 8; - public static final int PutCommentPoolSize = 2; - public static final int RegisterItemPoolSize = 2; - public static final int RegisterUserPoolSize = 2; - public static final int SearchItemsByCategoryPoolSize = 15; - public static final int SearchItemsByRegionPoolSize = 20; - public static final int StoreBidPoolSize = 8; - public static final int StoreBuyNowPoolSize = 4; - public static final int StoreCommentPoolSize = 2; - public static final int ViewBidHistoryPoolSize = 4; - public static final int ViewItemPoolSize = 20; - public static final int ViewUserInfoPoolSize = 4; -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.xml b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.xml deleted file mode 100644 index a248847e..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RUBBoS API]]> - Copyright © 2004 - ObjectWeb Consortium - All Rights Reserved.]]> - - - - - - - - - - - - - - - - - - - - - diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/web.xml b/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/web.xml deleted file mode 100644 index a937286a..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/web.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - - - - RUBBos - Rice University Bulletin Board System - - - BrowseCategories - edu.rice.rubbos.servlets.BrowseCategories - - - - BrowseStoriesByCategory - edu.rice.rubbos.servlets.BrowseStoriesByCategory - - - - ViewComment - edu.rice.rubbos.servlets.ViewComment - - - - ModerateComment - edu.rice.rubbos.servlets.ModerateComment - - - - PostComment - edu.rice.rubbos.servlets.PostComment - - - - StoreComment - edu.rice.rubbos.servlets.StoreComment - - - - SubmitStory - edu.rice.rubbos.servlets.SubmitStory - - - - AcceptStory - edu.rice.rubbos.servlets.AcceptStory - - - - RejectStory - edu.rice.rubbos.servlets.RejectStory - - - - ReviewStories - edu.rice.rubbos.servlets.ReviewStories - - - - StoreStory - edu.rice.rubbos.servlets.StoreStory - - - - ViewStory - edu.rice.rubbos.servlets.ViewStory - - - - StoriesOfTheDay - edu.rice.rubbos.servlets.StoriesOfTheDay - - - - Search - edu.rice.rubbos.servlets.Search - - - - StoreModeratorLog - edu.rice.rubbos.servlets.StoreModeratorLog - - - - RegisterUser - edu.rice.rubbos.servlets.RegisterUser - - - - Author - edu.rice.rubbos.servlets.Author - - - - OlderStories - edu.rice.rubbos.servlets.OlderStories - - - - - BrowseCategories - /servlet/edu.rice.rubbos.servlets.BrowseCategories - - - - BrowseStoriesByCategory - /servlet/edu.rice.rubbos.servlets.BrowseStoriesByCategory - - - - ViewComment - /servlet/edu.rice.rubbos.servlets.ViewComment - - - - ModerateComment - /servlet/edu.rice.rubbos.servlets.ModerateComment - - - - PostComment - /servlet/edu.rice.rubbos.servlets.PostComment - - - - StoreComment - /servlet/edu.rice.rubbos.servlets.StoreComment - - - - SubmitStory - /servlet/edu.rice.rubbos.servlets.SubmitStory - - - - AcceptStory - /servlet/edu.rice.rubbos.servlets.AcceptStory - - - - RejectStory - /servlet/edu.rice.rubbos.servlets.RejectStory - - - - ReviewStories - /servlet/edu.rice.rubbos.servlets.ReviewStories - - - - StoreStory - /servlet/edu.rice.rubbos.servlets.StoreStory - - - - ViewStory - /servlet/edu.rice.rubbos.servlets.ViewStory - - - - StoriesOfTheDay - /servlet/edu.rice.rubbos.servlets.StoriesOfTheDay - - - - - Search - /servlet/edu.rice.rubbos.servlets.Search - - - - StoreModeratorLog - /servlet/edu.rice.rubbos.servlets.StoreModeratorLog - - - - RegisterUser - /servlet/edu.rice.rubbos.servlets.RegisterUser - - - - Author - /servlet/edu.rice.rubbos.servlets.Author - - - - OlderStories - /servlet/edu.rice.rubbos.servlets.OlderStories - - - - 30 - - - diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml deleted file mode 100644 index 07a64362..00000000 --- a/testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml +++ /dev/null @@ -1,350 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - node1 - - - - - - - node2 - - - - - - - - - node3 - - - - - - - - - node4 - - - - - - - - - node5 - - - - - - - - - node6 - - - - - - - - - node7 - - - - - - - - - - - node8 - - - - - - - - - - - - - - node9 - - - - - - - - - - - - - diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java deleted file mode 100644 index f84ded04..00000000 --- a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java +++ /dev/null @@ -1,34 +0,0 @@ -package edu.rice.rubbos.servlets; - -public class Config -{ - - /** - * Creates a new Config instance. - */ - Config() - { - } - - - public static final String HTMLFilesPath = "/bottlenecks/rubbos/app/RUBBoS/Servlet_HTML"; - public static final String[] DatabaseProperties = {"/bottlenecks/rubbos/app/RUBBoS/Servlets/mysql.properties"}; - public static final int DatabasePropertiesSize = 1; - - public static final int AboutMePoolSize = 10; - public static final int BrowseCategoriesPoolSize = 6; - public static final int BrowseRegionsPoolSize = 6; - public static final int BuyNowPoolSize = 4; - public static final int PutBidPoolSize = 8; - public static final int PutCommentPoolSize = 2; - public static final int RegisterItemPoolSize = 2; - public static final int RegisterUserPoolSize = 2; - public static final int SearchItemsByCategoryPoolSize = 15; - public static final int SearchItemsByRegionPoolSize = 20; - public static final int StoreBidPoolSize = 8; - public static final int StoreBuyNowPoolSize = 4; - public static final int StoreCommentPoolSize = 2; - public static final int ViewBidHistoryPoolSize = 4; - public static final int ViewItemPoolSize = 20; - public static final int ViewUserInfoPoolSize = 4; -} diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml deleted file mode 100644 index 37472041..00000000 --- a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RUBBoS API]]> - Copyright © 2004 - ObjectWeb Consortium - All Rights Reserved.]]> - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml deleted file mode 100644 index e0a32b6b..00000000 --- a/testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - RUBBos - - Rice University Bulletin Board System - - - - - BrowseCategories - edu.rice.rubbos.servlets.BrowseCategories - - - - BrowseStoriesByCategory - edu.rice.rubbos.servlets.BrowseStoriesByCategory - - - - ViewComment - edu.rice.rubbos.servlets.ViewComment - - - - ModerateComment - edu.rice.rubbos.servlets.ModerateComment - - - - PostComment - edu.rice.rubbos.servlets.PostComment - - - - StoreComment - edu.rice.rubbos.servlets.StoreComment - - - - SubmitStory - edu.rice.rubbos.servlets.SubmitStory - - - - AcceptStory - edu.rice.rubbos.servlets.AcceptStory - - - - RejectStory - edu.rice.rubbos.servlets.RejectStory - - - - ReviewStories - edu.rice.rubbos.servlets.ReviewStories - - - - StoreStory - edu.rice.rubbos.servlets.StoreStory - - - - ViewStory - edu.rice.rubbos.servlets.ViewStory - - - - StoriesOfTheDay - edu.rice.rubbos.servlets.StoriesOfTheDay - - - - Search - edu.rice.rubbos.servlets.Search - - - - StoreModeratorLog - edu.rice.rubbos.servlets.StoreModeratorLog - - - - RegisterUser - edu.rice.rubbos.servlets.RegisterUser - - - - Author - edu.rice.rubbos.servlets.Author - - - - OlderStories - edu.rice.rubbos.servlets.OlderStories - - - - - BrowseCategories - /servlet/edu.rice.rubbos.servlets.BrowseCategories - - - - BrowseStoriesByCategory - /servlet/edu.rice.rubbos.servlets.BrowseStoriesByCategory - - - - ViewComment - /servlet/edu.rice.rubbos.servlets.ViewComment - - - - ModerateComment - /servlet/edu.rice.rubbos.servlets.ModerateComment - - - - PostComment - /servlet/edu.rice.rubbos.servlets.PostComment - - - - StoreComment - /servlet/edu.rice.rubbos.servlets.StoreComment - - - - SubmitStory - /servlet/edu.rice.rubbos.servlets.SubmitStory - - - - AcceptStory - /servlet/edu.rice.rubbos.servlets.AcceptStory - - - - RejectStory - /servlet/edu.rice.rubbos.servlets.RejectStory - - - - ReviewStories - /servlet/edu.rice.rubbos.servlets.ReviewStories - - - - StoreStory - /servlet/edu.rice.rubbos.servlets.StoreStory - - - - ViewStory - /servlet/edu.rice.rubbos.servlets.ViewStory - - - - StoriesOfTheDay - /servlet/edu.rice.rubbos.servlets.StoriesOfTheDay - - - - - Search - /servlet/edu.rice.rubbos.servlets.Search - - - - StoreModeratorLog - /servlet/edu.rice.rubbos.servlets.StoreModeratorLog - - - - RegisterUser - /servlet/edu.rice.rubbos.servlets.RegisterUser - - - - Author - /servlet/edu.rice.rubbos.servlets.Author - - - - OlderStories - /servlet/edu.rice.rubbos.servlets.OlderStories - - - - - 30 - - - diff --git a/testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml b/testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml deleted file mode 100644 index 525c4398..00000000 --- a/testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/testsuites/rubbos/testcase_cfg/rubbos-heavy_1-1-0-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos-heavy_1-1-0-1.yaml deleted file mode 100644 index 6f6872e6..00000000 --- a/testsuites/rubbos/testcase_cfg/rubbos-heavy_1-1-0-1.yaml +++ /dev/null @@ -1,470 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - HOT template to create a new neutron network plus a router to the public - network, and for deploying nine servers into the new network. The template also - assigns floating IP addresses to rubbos_control server so it is routable from the - public network. -parameters: - key_name: - type: string - description: Name of keypair to assign to servers - default: bottlenecks_rubbos_keypair - image: - type: string - description: Name of image to use for servers - default: bottlenecks-trusty-server - flavor: - type: string - description: Flavor to use for servers - default: bottlenecks_rubbos_flavor - public_net: - type: string - description: > - ID or name of public network for which floating IP addresses will be allocated - default: net04_ext - private_net_name: - type: string - description: Name of private network to be created - default: bottlenecks-private - private_net_cidr: - type: string - description: Private network address (CIDR notation) - default: "10.0.10.0/24" - private_net_gateway: - type: string - description: Private network gateway address - default: "10.0.10.1" - private_net_pool_start: - type: string - description: Start of private network IP address allocation pool - default: "10.0.10.2" - private_net_pool_end: - type: string - description: End of private network IP address allocation pool - default: "10.0.10.199" - master_user_data: - type: string - description: User data for the server with master role - default: "" - agent_user_data: - type: string - description: User data for the server with agent role - default: "" - -resources: - private_net: - type: OS::Neutron::Net - properties: - name: { get_param: private_net_name } - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_net } - cidr: { get_param: private_net_cidr } - gateway_ip: { get_param: private_net_gateway } - allocation_pools: - - start: { get_param: private_net_pool_start } - end: { get_param: private_net_pool_end } - dns_nameservers: [ "8.8.8.8" ] - - router: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_net } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router } - subnet_id: { get_resource: private_subnet } - - rubbos_control: - type: OS::Nova::Server - properties: - name: rubbos-control - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_control_port } - admin_user: ubuntu - user_data: { get_param: master_user_data } - user_data_format: RAW - - rubbos_control_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_control_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_net } - port_id: { get_resource: rubbos_control_port } - - rubbos_httpd: - type: OS::Nova::Server - properties: - name: rubbos-httpd - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_httpd_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_httpd_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_mysql1: - type: OS::Nova::Server - properties: - name: rubbos-mysql1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_mysql1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_mysql1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat1: - type: OS::Nova::Server - properties: - name: rubbos-tomcat1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat2: - type: OS::Nova::Server - properties: - name: rubbos-tomcat2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat2_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client1: - type: OS::Nova::Server - properties: - name: rubbos-client1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client2: - type: OS::Nova::Server - properties: - name: rubbos-client2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client2_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client3: - type: OS::Nova::Server - properties: - name: rubbos-client3 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client3_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client3_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client4: - type: OS::Nova::Server - properties: - name: rubbos-client4 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client4_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client4_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client5: - type: OS::Nova::Server - properties: - name: rubbos-client5 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client5_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client5_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client6: - type: OS::Nova::Server - properties: - name: rubbos-client6 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client6_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client6_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client7: - type: OS::Nova::Server - properties: - name: rubbos-client7 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client7_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client7_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client8: - type: OS::Nova::Server - properties: - name: rubbos-client8 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client8_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client8_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client9: - type: OS::Nova::Server - properties: - name: rubbos-client9 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client9_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client9_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client10: - type: OS::Nova::Server - properties: - name: rubbos-client10 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client10_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client10_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - server_security_group: - type: OS::Neutron::SecurityGroup - properties: - description: Rubbos group for servers access. - name: rubbos-security-group - rules: [ - {remote_ip_prefix: 0.0.0.0/0, - protocol: tcp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: udp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: icmp}] - -outputs: - rubbos_control_private_ip: - description: IP address of rubbos_control in private network - value: { get_attr: [ rubbos_control, first_address ] } - rubbos_control_public_ip: - description: Floating IP address of rubbos_control in public network - value: { get_attr: [ rubbos_control_floating_ip, floating_ip_address ] } - rubbos_httpd_private_ip: - description: IP address of rubbos_httpd in private network - value: { get_attr: [ rubbos_httpd, first_address ] } - rubbos_mysql1_private_ip: - description: IP address of rubbos_mysql1 in private network - value: { get_attr: [ rubbos_mysql1, first_address ] } - rubbos_tomcat1_private_ip: - description: IP address of rubbos_tomcat1 in private network - value: { get_attr: [ rubbos_tomcat1, first_address ] } - rubbos_tomcat2_private_ip: - description: IP address of rubbos_tomcat2 in private network - value: { get_attr: [ rubbos_tomcat2, first_address ] } - rubbos_client1_private_ip: - description: IP address of rubbos_client1 in private network - value: { get_attr: [ rubbos_client1, first_address ] } - rubbos_client2_private_ip: - description: IP address of rubbos_client2 in private network - value: { get_attr: [ rubbos_client2, first_address ] } - rubbos_client3_private_ip: - description: IP address of rubbos_client3 in private network - value: { get_attr: [ rubbos_client3, first_address ] } - rubbos_client4_private_ip: - description: IP address of rubbos_client4 in private network - value: { get_attr: [ rubbos_client4, first_address ] } - rubbos_client5_private_ip: - description: IP address of rubbos_client5 in private network - value: { get_attr: [ rubbos_client5, first_address ] } - rubbos_client6_private_ip: - description: IP address of rubbos_client6 in private network - value: { get_attr: [ rubbos_client6, first_address ] } - rubbos_client7_private_ip: - description: IP address of rubbos_client7 in private network - value: { get_attr: [ rubbos_client7, first_address ] } - rubbos_client8_private_ip: - description: IP address of rubbos_client8 in private network - value: { get_attr: [ rubbos_client8, first_address ] } - rubbos_client9_private_ip: - description: IP address of rubbos_client9 in private network - value: { get_attr: [ rubbos_client9, first_address ] } - rubbos_client10_private_ip: - description: IP address of rubbos_client10 in private network - value: { get_attr: [ rubbos_client10, first_address ] } diff --git a/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml deleted file mode 100755 index 0a401dce..00000000 --- a/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml +++ /dev/null @@ -1,327 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - HOT template to create a new neutron network plus a router to the public - network, and for deploying nine servers into the new network. The template also - assigns floating IP addresses to rubbos_control server so it is routable from the - public network. -parameters: - key_name: - type: string - description: Name of keypair to assign to servers - default: bottlenecks_rubbos_keypair - image: - type: string - description: Name of image to use for servers - default: bottlenecks-trusty-server - flavor: - type: string - description: Flavor to use for servers - default: bottlenecks_rubbos_flavor - public_net: - type: string - description: > - ID or name of public network for which floating IP addresses will be allocated - default: net04_ext - private_net_name: - type: string - description: Name of private network to be created - default: bottlenecks-private - private_net_cidr: - type: string - description: Private network address (CIDR notation) - default: "10.0.10.0/24" - private_net_gateway: - type: string - description: Private network gateway address - default: "10.0.10.1" - private_net_pool_start: - type: string - description: Start of private network IP address allocation pool - default: "10.0.10.2" - private_net_pool_end: - type: string - description: End of private network IP address allocation pool - default: "10.0.10.199" - master_user_data: - type: string - description: User data for the server with master role - default: "" - agent_user_data: - type: string - description: User data for the server with agent role - default: "" - -resources: - private_net: - type: OS::Neutron::Net - properties: - name: { get_param: private_net_name } - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_net } - cidr: { get_param: private_net_cidr } - gateway_ip: { get_param: private_net_gateway } - allocation_pools: - - start: { get_param: private_net_pool_start } - end: { get_param: private_net_pool_end } - dns_nameservers: [ "8.8.8.8" ] - - router: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_net } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router } - subnet_id: { get_resource: private_subnet } - - rubbos_control: - type: OS::Nova::Server - properties: - name: rubbos-control - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_control_port } - admin_user: ubuntu - user_data: { get_param: master_user_data } - user_data_format: RAW - - rubbos_control_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_control_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_net } - port_id: { get_resource: rubbos_control_port } - - rubbos_httpd: - type: OS::Nova::Server - properties: - name: rubbos-httpd - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_httpd_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_httpd_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_mysql1: - type: OS::Nova::Server - properties: - name: rubbos-mysql1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_mysql1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_mysql1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat1: - type: OS::Nova::Server - properties: - name: rubbos-tomcat1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client1: - type: OS::Nova::Server - properties: - name: rubbos-client1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client2: - type: OS::Nova::Server - properties: - name: rubbos-client2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client2_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client3: - type: OS::Nova::Server - properties: - name: rubbos-client3 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client3_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client3_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client4: - type: OS::Nova::Server - properties: - name: rubbos-client4 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client4_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client4_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client5: - type: OS::Nova::Server - properties: - name: rubbos-client5 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client5_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client5_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - server_security_group: - type: OS::Neutron::SecurityGroup - properties: - description: Rubbos group for servers access. - name: rubbos-security-group - rules: [ - {remote_ip_prefix: 0.0.0.0/0, - protocol: tcp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: udp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: icmp}] - -outputs: - rubbos_control_private_ip: - description: IP address of rubbos_control in private network - value: { get_attr: [ rubbos_control, first_address ] } - rubbos_control_public_ip: - description: Floating IP address of rubbos_control in public network - value: { get_attr: [ rubbos_control_floating_ip, floating_ip_address ] } - rubbos_httpd_private_ip: - description: IP address of rubbos_httpd in private network - value: { get_attr: [ rubbos_httpd, first_address ] } - rubbos_mysql1_private_ip: - description: IP address of rubbos_mysql1 in private network - value: { get_attr: [ rubbos_mysql1, first_address ] } - rubbos_tomcat1_private_ip: - description: IP address of rubbos_tomcat1 in private network - value: { get_attr: [ rubbos_tomcat1, first_address ] } - rubbos_client1_private_ip: - description: IP address of rubbos_client1 in private network - value: { get_attr: [ rubbos_client1, first_address ] } - rubbos_client2_private_ip: - description: IP address of rubbos_client2 in private network - value: { get_attr: [ rubbos_client2, first_address ] } - rubbos_client3_private_ip: - description: IP address of rubbos_client3 in private network - value: { get_attr: [ rubbos_client3, first_address ] } - rubbos_client4_private_ip: - description: IP address of rubbos_client4 in private network - value: { get_attr: [ rubbos_client4, first_address ] } - rubbos_client5_private_ip: - description: IP address of rubbos_client5 in private network - value: { get_attr: [ rubbos_client5, first_address ] } - diff --git a/testsuites/rubbos/testcase_cfg/rubbos_1-2-0-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-2-0-1.yaml deleted file mode 100644 index 86a3da5c..00000000 --- a/testsuites/rubbos/testcase_cfg/rubbos_1-2-0-1.yaml +++ /dev/null @@ -1,350 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - HOT template to create a new neutron network plus a router to the public - network, and for deploying nine servers into the new network. The template also - assigns floating IP addresses to rubbos_control server so it is routable from the - public network. -parameters: - key_name: - type: string - description: Name of keypair to assign to servers - default: bottlenecks_rubbos_keypair - image: - type: string - description: Name of image to use for servers - default: bottlenecks-trusty-server - flavor: - type: string - description: Flavor to use for servers - default: bottlenecks_rubbos_flavor - public_net: - type: string - description: > - ID or name of public network for which floating IP addresses will be allocated - default: net04_ext - private_net_name: - type: string - description: Name of private network to be created - default: bottlenecks-private - private_net_cidr: - type: string - description: Private network address (CIDR notation) - default: "10.0.10.0/24" - private_net_gateway: - type: string - description: Private network gateway address - default: "10.0.10.1" - private_net_pool_start: - type: string - description: Start of private network IP address allocation pool - default: "10.0.10.2" - private_net_pool_end: - type: string - description: End of private network IP address allocation pool - default: "10.0.10.199" - master_user_data: - type: string - description: User data for the server with master role - default: "" - agent_user_data: - type: string - description: User data for the server with agent role - default: "" - -resources: - private_net: - type: OS::Neutron::Net - properties: - name: { get_param: private_net_name } - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_net } - cidr: { get_param: private_net_cidr } - gateway_ip: { get_param: private_net_gateway } - allocation_pools: - - start: { get_param: private_net_pool_start } - end: { get_param: private_net_pool_end } - dns_nameservers: [ "8.8.8.8" ] - - router: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_net } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router } - subnet_id: { get_resource: private_subnet } - - rubbos_control: - type: OS::Nova::Server - properties: - name: rubbos-control - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_control_port } - admin_user: ubuntu - user_data: { get_param: master_user_data } - user_data_format: RAW - - rubbos_control_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_control_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_net } - port_id: { get_resource: rubbos_control_port } - - rubbos_httpd: - type: OS::Nova::Server - properties: - name: rubbos-httpd - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_httpd_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_httpd_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_mysql1: - type: OS::Nova::Server - properties: - name: rubbos-mysql1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_mysql1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_mysql1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat1: - type: OS::Nova::Server - properties: - name: rubbos-tomcat1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat2: - type: OS::Nova::Server - properties: - name: rubbos-tomcat2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat2_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client1: - type: OS::Nova::Server - properties: - name: rubbos-client1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client2: - type: OS::Nova::Server - properties: - name: rubbos-client2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client2_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client3: - type: OS::Nova::Server - properties: - name: rubbos-client3 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client3_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client3_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client4: - type: OS::Nova::Server - properties: - name: rubbos-client4 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client4_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client4_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client5: - type: OS::Nova::Server - properties: - name: rubbos-client5 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client5_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client5_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - server_security_group: - type: OS::Neutron::SecurityGroup - properties: - description: Rubbos group for servers access. - name: rubbos-security-group - rules: [ - {remote_ip_prefix: 0.0.0.0/0, - protocol: tcp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: udp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: icmp}] - -outputs: - rubbos_control_private_ip: - description: IP address of rubbos_control in private network - value: { get_attr: [ rubbos_control, first_address ] } - rubbos_control_public_ip: - description: Floating IP address of rubbos_control in public network - value: { get_attr: [ rubbos_control_floating_ip, floating_ip_address ] } - rubbos_httpd_private_ip: - description: IP address of rubbos_httpd in private network - value: { get_attr: [ rubbos_httpd, first_address ] } - rubbos_mysql1_private_ip: - description: IP address of rubbos_mysql1 in private network - value: { get_attr: [ rubbos_mysql1, first_address ] } - rubbos_tomcat1_private_ip: - description: IP address of rubbos_tomcat1 in private network - value: { get_attr: [ rubbos_tomcat1, first_address ] } - rubbos_tomcat2_private_ip: - description: IP address of rubbos_tomcat2 in private network - value: { get_attr: [ rubbos_tomcat2, first_address ] } - rubbos_client1_private_ip: - description: IP address of rubbos_client1 in private network - value: { get_attr: [ rubbos_client1, first_address ] } - rubbos_client2_private_ip: - description: IP address of rubbos_client2 in private network - value: { get_attr: [ rubbos_client2, first_address ] } - rubbos_client3_private_ip: - description: IP address of rubbos_client3 in private network - value: { get_attr: [ rubbos_client3, first_address ] } - rubbos_client4_private_ip: - description: IP address of rubbos_client4 in private network - value: { get_attr: [ rubbos_client4, first_address ] } - rubbos_client5_private_ip: - description: IP address of rubbos_client5 in private network - value: { get_attr: [ rubbos_client5, first_address ] } diff --git a/testsuites/rubbos/testcase_cfg/rubbos_1-3-0-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-3-0-1.yaml deleted file mode 100644 index f003d28a..00000000 --- a/testsuites/rubbos/testcase_cfg/rubbos_1-3-0-1.yaml +++ /dev/null @@ -1,374 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - HOT template to create a new neutron network plus a router to the public - network, and for deploying nine servers into the new network. The template also - assigns floating IP addresses to rubbos_control server so it is routable from the - public network. -parameters: - key_name: - type: string - description: Name of keypair to assign to servers - default: bottlenecks_rubbos_keypair - image: - type: string - description: Name of image to use for servers - default: bottlenecks-trusty-server - flavor: - type: string - description: Flavor to use for servers - default: bottlenecks_rubbos_flavor - public_net: - type: string - description: > - ID or name of public network for which floating IP addresses will be allocated - default: net04_ext - private_net_name: - type: string - description: Name of private network to be created - default: bottlenecks-private - private_net_cidr: - type: string - description: Private network address (CIDR notation) - default: "10.0.10.0/24" - private_net_gateway: - type: string - description: Private network gateway address - default: "10.0.10.1" - private_net_pool_start: - type: string - description: Start of private network IP address allocation pool - default: "10.0.10.2" - private_net_pool_end: - type: string - description: End of private network IP address allocation pool - default: "10.0.10.199" - master_user_data: - type: string - description: User data for the server with master role - default: "" - agent_user_data: - type: string - description: User data for the server with agent role - default: "" - -resources: - private_net: - type: OS::Neutron::Net - properties: - name: { get_param: private_net_name } - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_net } - cidr: { get_param: private_net_cidr } - gateway_ip: { get_param: private_net_gateway } - allocation_pools: - - start: { get_param: private_net_pool_start } - end: { get_param: private_net_pool_end } - dns_nameservers: [ "8.8.8.8" ] - - router: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_net } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router } - subnet_id: { get_resource: private_subnet } - - rubbos_control: - type: OS::Nova::Server - properties: - name: rubbos-control - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_control_port } - admin_user: ubuntu - user_data: { get_param: master_user_data } - user_data_format: RAW - - rubbos_control_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_control_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_net } - port_id: { get_resource: rubbos_control_port } - - rubbos_httpd: - type: OS::Nova::Server - properties: - name: rubbos-httpd - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_httpd_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_httpd_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_mysql1: - type: OS::Nova::Server - properties: - name: rubbos-mysql1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_mysql1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_mysql1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat1: - type: OS::Nova::Server - properties: - name: rubbos-tomcat1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat2: - type: OS::Nova::Server - properties: - name: rubbos-tomcat2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat2_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat3: - type: OS::Nova::Server - properties: - name: rubbos-tomcat3 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat3_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat3_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client1: - type: OS::Nova::Server - properties: - name: rubbos-client1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client2: - type: OS::Nova::Server - properties: - name: rubbos-client2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client2_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client3: - type: OS::Nova::Server - properties: - name: rubbos-client3 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client3_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client3_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client4: - type: OS::Nova::Server - properties: - name: rubbos-client4 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client4_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client4_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client5: - type: OS::Nova::Server - properties: - name: rubbos-client5 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client5_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client5_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - server_security_group: - type: OS::Neutron::SecurityGroup - properties: - description: Rubbos group for servers access. - name: rubbos-security-group - rules: [ - {remote_ip_prefix: 0.0.0.0/0, - protocol: tcp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: udp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: icmp}] - -outputs: - rubbos_control_private_ip: - description: IP address of rubbos_control in private network - value: { get_attr: [ rubbos_control, first_address ] } - rubbos_control_public_ip: - description: Floating IP address of rubbos_control in public network - value: { get_attr: [ rubbos_control_floating_ip, floating_ip_address ] } - rubbos_httpd_private_ip: - description: IP address of rubbos_httpd in private network - value: { get_attr: [ rubbos_httpd, first_address ] } - rubbos_mysql1_private_ip: - description: IP address of rubbos_mysql1 in private network - value: { get_attr: [ rubbos_mysql1, first_address ] } - rubbos_tomcat1_private_ip: - description: IP address of rubbos_tomcat1 in private network - value: { get_attr: [ rubbos_tomcat1, first_address ] } - rubbos_tomcat2_private_ip: - description: IP address of rubbos_tomcat2 in private network - value: { get_attr: [ rubbos_tomcat2, first_address ] } - rubbos_tomcat3_private_ip: - description: IP address of rubbos_tomcat3 in private network - value: { get_attr: [ rubbos_tomcat3, first_address ] } - rubbos_client1_private_ip: - description: IP address of rubbos_client1 in private network - value: { get_attr: [ rubbos_client1, first_address ] } - rubbos_client2_private_ip: - description: IP address of rubbos_client2 in private network - value: { get_attr: [ rubbos_client2, first_address ] } - rubbos_client3_private_ip: - description: IP address of rubbos_client3 in private network - value: { get_attr: [ rubbos_client3, first_address ] } - rubbos_client4_private_ip: - description: IP address of rubbos_client4 in private network - value: { get_attr: [ rubbos_client4, first_address ] } - rubbos_client5_private_ip: - description: IP address of rubbos_client5 in private network - value: { get_attr: [ rubbos_client5, first_address ] } diff --git a/testsuites/rubbos/testcase_cfg/rubbos_1-4-0-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-4-0-1.yaml deleted file mode 100644 index 30b52c75..00000000 --- a/testsuites/rubbos/testcase_cfg/rubbos_1-4-0-1.yaml +++ /dev/null @@ -1,398 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - HOT template to create a new neutron network plus a router to the public - network, and for deploying multiple servers needed into the new network. - The template also assigns floating IP addresses to rubbos_control server - so it is routable from the public network. -parameters: - key_name: - type: string - description: Name of keypair to assign to servers - default: bottlenecks_rubbos_keypair - image: - type: string - description: Name of image to use for servers - default: bottlenecks-trusty-server - flavor: - type: string - description: Flavor to use for servers - default: bottlenecks_rubbos_flavor - public_net: - type: string - description: > - ID or name of public network for which floating IP addresses will be allocated - default: net04_ext - private_net_name: - type: string - description: Name of private network to be created - default: bottlenecks-private - private_net_cidr: - type: string - description: Private network address (CIDR notation) - default: "10.0.10.0/24" - private_net_gateway: - type: string - description: Private network gateway address - default: "10.0.10.1" - private_net_pool_start: - type: string - description: Start of private network IP address allocation pool - default: "10.0.10.2" - private_net_pool_end: - type: string - description: End of private network IP address allocation pool - default: "10.0.10.199" - master_user_data: - type: string - description: User data for the server with master role - default: "" - agent_user_data: - type: string - description: User data for the server with agent role - default: "" - -resources: - private_net: - type: OS::Neutron::Net - properties: - name: { get_param: private_net_name } - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_net } - cidr: { get_param: private_net_cidr } - gateway_ip: { get_param: private_net_gateway } - allocation_pools: - - start: { get_param: private_net_pool_start } - end: { get_param: private_net_pool_end } - dns_nameservers: [ "8.8.8.8" ] - - router: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_net } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router } - subnet_id: { get_resource: private_subnet } - - rubbos_control: - type: OS::Nova::Server - properties: - name: rubbos-control - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_control_port } - admin_user: ubuntu - user_data: { get_param: master_user_data } - user_data_format: RAW - - rubbos_control_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_control_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_net } - port_id: { get_resource: rubbos_control_port } - - rubbos_httpd: - type: OS::Nova::Server - properties: - name: rubbos-httpd - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_httpd_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_httpd_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_mysql1: - type: OS::Nova::Server - properties: - name: rubbos-mysql1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_mysql1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_mysql1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat1: - type: OS::Nova::Server - properties: - name: rubbos-tomcat1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat2: - type: OS::Nova::Server - properties: - name: rubbos-tomcat2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat2_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat3: - type: OS::Nova::Server - properties: - name: rubbos-tomcat3 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat3_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat3_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group } - - rubbos_tomcat4: - type: OS::Nova::Server - properties: - name: rubbos-tomcat4 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat4_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat4_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group } - - rubbos_client1: - type: OS::Nova::Server - properties: - name: rubbos-client1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client2: - type: OS::Nova::Server - properties: - name: rubbos-client2 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client2_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client2_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client3: - type: OS::Nova::Server - properties: - name: rubbos-client3 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client3_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client3_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client4: - type: OS::Nova::Server - properties: - name: rubbos-client4 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client4_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client4_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client5: - type: OS::Nova::Server - properties: - name: rubbos-client5 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client5_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client5_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - server_security_group: - type: OS::Neutron::SecurityGroup - properties: - description: Rubbos group for servers access. - name: rubbos-security-group - rules: [ - {remote_ip_prefix: 0.0.0.0/0, - protocol: tcp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: udp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: icmp}] - -outputs: - rubbos_control_private_ip: - description: IP address of rubbos_control in private network - value: { get_attr: [ rubbos_control, first_address ] } - rubbos_control_public_ip: - description: Floating IP address of rubbos_control in public network - value: { get_attr: [ rubbos_control_floating_ip, floating_ip_address ] } - rubbos_httpd_private_ip: - description: IP address of rubbos_httpd in private network - value: { get_attr: [ rubbos_httpd, first_address ] } - rubbos_mysql1_private_ip: - description: IP address of rubbos_mysql1 in private network - value: { get_attr: [ rubbos_mysql1, first_address ] } - rubbos_tomcat1_private_ip: - description: IP address of rubbos_tomcat1 in private network - value: { get_attr: [ rubbos_tomcat1, first_address ] } - rubbos_tomcat2_private_ip: - description: IP address of rubbos_tomcat2 in private network - value: { get_attr: [ rubbos_tomcat2, first_address ] } - rubbos_tomcat3_private_ip: - description: IP address of rubbos_tomcat3 in private network - value: { get_attr: [ rubbos_tomcat3, first_address ] } - rubbos_tomcat4_private_ip: - description: IP address of rubbos_tomcat4 in private network - value: { get_attr: [ rubbos_tomcat4, first_address ] } - rubbos_client1_private_ip: - description: IP address of rubbos_client1 in private network - value: { get_attr: [ rubbos_client1, first_address ] } - rubbos_client2_private_ip: - description: IP address of rubbos_client2 in private network - value: { get_attr: [ rubbos_client2, first_address ] } - rubbos_client3_private_ip: - description: IP address of rubbos_client3 in private network - value: { get_attr: [ rubbos_client3, first_address ] } - rubbos_client4_private_ip: - description: IP address of rubbos_client4 in private network - value: { get_attr: [ rubbos_client4, first_address ] } - rubbos_client5_private_ip: - description: IP address of rubbos_client5 in private network - value: { get_attr: [ rubbos_client5, first_address ] } diff --git a/testsuites/rubbos/testcase_cfg/rubbos_basic.yaml b/testsuites/rubbos/testcase_cfg/rubbos_basic.yaml deleted file mode 100644 index 791c95fc..00000000 --- a/testsuites/rubbos/testcase_cfg/rubbos_basic.yaml +++ /dev/null @@ -1,227 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - HOT template to create a stack with minimum number of resources for rubbos. -parameters: - key_name: - type: string - description: Name of keypair to assign to servers - default: bottlenecks_rubbos_keypair - image: - type: string - description: Name of image to use for servers - default: bottlenecks-trusty-server - flavor: - type: string - description: Flavor to use for servers - default: bottlenecks_rubbos_flavor - public_net: - type: string - description: > - ID or name of public network for which floating IP addresses will be allocated - default: net04_ext - private_net_name: - type: string - description: Name of private network to be created - default: bottlenecks-private - private_net_cidr: - type: string - description: Private network address (CIDR notation) - default: "10.0.10.0/24" - private_net_gateway: - type: string - description: Private network gateway address - default: "10.0.10.1" - private_net_pool_start: - type: string - description: Start of private network IP address allocation pool - default: "10.0.10.2" - private_net_pool_end: - type: string - description: End of private network IP address allocation pool - default: "10.0.10.199" - master_user_data: - type: string - description: User data for the server with master role - default: "" - agent_user_data: - type: string - description: User data for the server with agent role - default: "" - -resources: - private_net: - type: OS::Neutron::Net - properties: - name: { get_param: private_net_name } - - private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: private_net } - cidr: { get_param: private_net_cidr } - gateway_ip: { get_param: private_net_gateway } - allocation_pools: - - start: { get_param: private_net_pool_start } - end: { get_param: private_net_pool_end } - dns_nameservers: [ "8.8.8.8" ] - - router: - type: OS::Neutron::Router - properties: - external_gateway_info: - network: { get_param: public_net } - - router_interface: - type: OS::Neutron::RouterInterface - properties: - router_id: { get_resource: router } - subnet_id: { get_resource: private_subnet } - - rubbos_control: - type: OS::Nova::Server - properties: - name: rubbos-control - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_control_port } - admin_user: ubuntu - user_data: { get_param: master_user_data } - user_data_format: RAW - - rubbos_control_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_control_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network: { get_param: public_net } - port_id: { get_resource: rubbos_control_port } - - rubbos_httpd: - type: OS::Nova::Server - properties: - name: rubbos-httpd - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_httpd_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_httpd_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_mysql1: - type: OS::Nova::Server - properties: - name: rubbos-mysql1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_mysql1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_mysql1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_tomcat1: - type: OS::Nova::Server - properties: - name: rubbos-tomcat1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_tomcat1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_tomcat1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - rubbos_client1: - type: OS::Nova::Server - properties: - name: rubbos-client1 - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client1_port } - admin_user: ubuntu - user_data: { get_param: agent_user_data } - user_data_format: RAW - - rubbos_client1_port: - type: OS::Neutron::Port - properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } - security_groups: [{ get_resource: server_security_group }] - - server_security_group: - type: OS::Neutron::SecurityGroup - properties: - description: Rubbos group for servers access. - name: rubbos-security-group - rules: [ - {remote_ip_prefix: 0.0.0.0/0, - protocol: tcp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: udp, - port_range_min: 1, - port_range_max: 65535}, - {remote_ip_prefix: 0.0.0.0/0, - protocol: icmp}] - -outputs: - rubbos_control_private_ip: - description: IP address of rubbos_control in private network - value: { get_attr: [ rubbos_control, first_address ] } - rubbos_control_public_ip: - description: Floating IP address of rubbos_control in public network - value: { get_attr: [ rubbos_control_floating_ip, floating_ip_address ] } - rubbos_httpd_private_ip: - description: IP address of rubbos_httpd in private network - value: { get_attr: [ rubbos_httpd, first_address ] } - rubbos_mysql1_private_ip: - description: IP address of rubbos_mysql1 in private network - value: { get_attr: [ rubbos_mysql1, first_address ] } - rubbos_tomcat1_private_ip: - description: IP address of rubbos_tomcat1 in private network - value: { get_attr: [ rubbos_tomcat1, first_address ] } - rubbos_client1_private_ip: - description: IP address of rubbos_client1 in private network - value: { get_attr: [ rubbos_client1, first_address ] } diff --git a/testsuites/vstf/testcase_cfg/vstf_Ti1.yaml b/testsuites/vstf/testcase_cfg/vstf_Ti1.yaml old mode 100755 new mode 100644 index e0e63bb3..071c7ad9 --- a/testsuites/vstf/testcase_cfg/vstf_Ti1.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_Ti1.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + tool: netperf protocol: udp type: frameloss diff --git a/testsuites/vstf/testcase_cfg/vstf_Ti2.yaml b/testsuites/vstf/testcase_cfg/vstf_Ti2.yaml old mode 100755 new mode 100644 index c7fc2116..8970d48d --- a/testsuites/vstf/testcase_cfg/vstf_Ti2.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_Ti2.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + tool: pktgen protocol: udp type: frameloss diff --git a/testsuites/vstf/testcase_cfg/vstf_Ti3.yaml b/testsuites/vstf/testcase_cfg/vstf_Ti3.yaml old mode 100755 new mode 100644 index 4ab2bdd0..c0a07433 --- a/testsuites/vstf/testcase_cfg/vstf_Ti3.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_Ti3.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + tool: pktgen protocol: udp type: frameloss diff --git a/testsuites/vstf/testcase_cfg/vstf_Tn1.yaml b/testsuites/vstf/testcase_cfg/vstf_Tn1.yaml old mode 100755 new mode 100644 index e0e63bb3..071c7ad9 --- a/testsuites/vstf/testcase_cfg/vstf_Tn1.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_Tn1.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + tool: netperf protocol: udp type: frameloss diff --git a/testsuites/vstf/testcase_cfg/vstf_Tn2.yaml b/testsuites/vstf/testcase_cfg/vstf_Tn2.yaml old mode 100755 new mode 100644 index 78c49906..c0a07433 --- a/testsuites/vstf/testcase_cfg/vstf_Tn2.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_Tn2.yaml @@ -1,7 +1,16 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + tool: pktgen protocol: udp type: frameloss sizes: 64, 128, 512, 1024 senders: 0, -1 receivers: -1, 0 -flows: 2 +flows: 2 diff --git a/testsuites/vstf/testcase_cfg/vstf_Tu1.yaml b/testsuites/vstf/testcase_cfg/vstf_Tu1.yaml old mode 100755 new mode 100644 index e0e63bb3..071c7ad9 --- a/testsuites/vstf/testcase_cfg/vstf_Tu1.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_Tu1.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + tool: netperf protocol: udp type: frameloss diff --git a/testsuites/vstf/testcase_cfg/vstf_Tu2.yaml b/testsuites/vstf/testcase_cfg/vstf_Tu2.yaml old mode 100755 new mode 100644 index c7fc2116..8970d48d --- a/testsuites/vstf/testcase_cfg/vstf_Tu2.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_Tu2.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + tool: pktgen protocol: udp type: frameloss diff --git a/testsuites/vstf/testcase_cfg/vstf_Tu3.yaml b/testsuites/vstf/testcase_cfg/vstf_Tu3.yaml old mode 100755 new mode 100644 index 9e066b16..f6880c81 --- a/testsuites/vstf/testcase_cfg/vstf_Tu3.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_Tu3.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + tool: netperf protocol: udp type: frameloss diff --git a/testsuites/vstf/testcase_cfg/vstf_heat_template.yaml b/testsuites/vstf/testcase_cfg/vstf_heat_template.yaml old mode 100755 new mode 100644 index b69abfd7..67d4c180 --- a/testsuites/vstf/testcase_cfg/vstf_heat_template.yaml +++ b/testsuites/vstf/testcase_cfg/vstf_heat_template.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## + heat_template_version: 2013-05-23 description: > This template is used for creating a new environment on the Openstack Release L , -- cgit 1.2.3-korg