summaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
Diffstat (limited to 'testsuites')
-rw-r--r--testsuites/__init__.py9
-rw-r--r--testsuites/posca/__init__.py8
-rw-r--r--testsuites/posca/testcase_cfg/__init__.py9
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_cpu_burden.yaml9
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_rx_cache_size.yaml9
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_rx_pkt_size.yaml9
-rw-r--r--[-rwxr-xr-x]testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml9
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_tx_cache_size.yaml9
-rw-r--r--testsuites/posca/testcase_cfg/posca_factor_tx_pkt_size.yaml9
-rw-r--r--testsuites/posca/testcase_cfg/posca_stress_ping.yaml9
-rw-r--r--testsuites/posca/testcase_script/__init__.py8
-rw-r--r--testsuites/posca/testsuite_story/__init__.py9
-rw-r--r--testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/server.xml38
-rw-r--r--testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/Config.java35
-rw-r--r--testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/build.xml82
-rw-r--r--testsuites/rubbos/puppet_manifests/modules/rubbos_tomcat/files/tomcat_sl/web.xml199
-rw-r--r--testsuites/rubbos/rubbos_scripts/1-1-1/1-1-1.xml350
-rw-r--r--testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/Config.java34
-rw-r--r--testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/build.xml114
-rw-r--r--testsuites/rubbos/rubbos_scripts/1-1-1/rubbos_conf/web.xml203
-rw-r--r--testsuites/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml79
-rw-r--r--testsuites/rubbos/testcase_cfg/rubbos-heavy_1-1-0-1.yaml470
-rwxr-xr-xtestsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml327
-rw-r--r--testsuites/rubbos/testcase_cfg/rubbos_1-2-0-1.yaml350
-rw-r--r--testsuites/rubbos/testcase_cfg/rubbos_1-3-0-1.yaml374
-rw-r--r--testsuites/rubbos/testcase_cfg/rubbos_1-4-0-1.yaml398
-rw-r--r--testsuites/rubbos/testcase_cfg/rubbos_basic.yaml227
-rw-r--r--[-rwxr-xr-x]testsuites/vstf/testcase_cfg/vstf_Ti1.yaml9
-rw-r--r--[-rwxr-xr-x]testsuites/vstf/testcase_cfg/vstf_Ti2.yaml9
-rw-r--r--[-rwxr-xr-x]testsuites/vstf/testcase_cfg/vstf_Ti3.yaml9
-rw-r--r--[-rwxr-xr-x]testsuites/vstf/testcase_cfg/vstf_Tn1.yaml9
-rw-r--r--[-rwxr-xr-x]testsuites/vstf/testcase_cfg/vstf_Tn2.yaml11
-rw-r--r--[-rwxr-xr-x]testsuites/vstf/testcase_cfg/vstf_Tu1.yaml9
-rw-r--r--[-rwxr-xr-x]testsuites/vstf/testcase_cfg/vstf_Tu2.yaml9
-rw-r--r--[-rwxr-xr-x]testsuites/vstf/testcase_cfg/vstf_Tu3.yaml9
-rw-r--r--[-rwxr-xr-x]testsuites/vstf/testcase_cfg/vstf_heat_template.yaml9
36 files changed, 145 insertions, 3324 deletions
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
index dcea7275..de2966b7 100755..100644
--- 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 @@
-<Server port="8005" shutdown="SHUTDOWN">
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
-
- <GlobalNamingResources>
- <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
- </GlobalNamingResources>
-
- <!-- Define the Tomcat Stand-Alone Service -->
- <Service name="Catalina">
- <!-- Define a non-SSL HTTP/1.1 Connector on port 2117 (default 8080) -->
- <Connector port="8080" maxHttpHeaderSize="8192"
- maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
- enableLookups="false" redirectPort="8443" acceptCount="6000"
- connectionTimeout="20000" disableUploadTimeout="true" />
-
- <!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009"
- maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
- acceptCount="6000" redirectPort="8443" protocol="AJP/1.3" />
-
- <!-- Define the top level container in our container hierarchy -->
- <Engine name="Catalina" defaultHost="localhost">
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
- <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common" resolveHosts="false"/>
- </Host>
- </Engine>
- </Service>
-
-</Server>
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 <code>Config</code> 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 @@
-<project name="RUBBoS Servlets" default="dist" basedir=".">
- <property file="../build.properties" />
- <property name="servlets.html" value="../Servlet_HTML" />
-
- <target name="init">
- <tstamp/>
- <mkdir dir="${classes.dir}"/>
- </target>
-
- <path id="base.classpath">
- <pathelement location="${classes.dir}" />
- <fileset dir="${j2ee}/lib">
- <include name="j2ee.jar"/>
- </fileset>
- </path>
-
- <target name="compile" depends="init">
- <javac srcdir="${src}"
- includes="edu/rice/rubbos/servlets/*"
- destdir="${classes.dir}"
- classpath="${build.classpath}"
- depend="yes">
- <classpath refid="base.classpath" />
- </javac>
- </target>
-
- <target name="jar" depends="init, compile">
- <jar destfile="${dist}/rubbos_servlets.jar">
- <fileset dir="${classes.dir}"
- includes="edu/rice/rubbos/servlets/*.class"/>
- </jar>
- </target>
-
- <target name="war" depends="init, compile, jar">
- <copy file="${dist}/rubbos_servlets.jar" todir="${servlets.html}/WEB-INF/lib"/>
- <copy file="${j2ee}/lib/j2ee.jar" todir="${servlets.html}/WEB-INF/lib"/>
- <copy file="${mysql_connector}" todir="${servlets.html}/WEB-INF/lib"/>
-
- <war destfile="${dist}/rubbos.war" webxml="${servlets.html}/WEB-INF/web.xml" basedir="${web.dir}">
- <fileset dir="${classes.dir}"
- includes="*" excludes="*/web.xml"/>
- <classes dir="${classes.dir}"/>
- </war>
- </target>
-
- <target name="dist" depends="init, compile, jar, war">
- </target>
-
- <target name="doc">
- <mkdir dir="docs/api"/>
- <javadoc classpathref="base.classpath"
- packagenames="edu.rice.rubbos.*.*"
- sourcepath="."
- defaultexcludes="yes"
- destdir="docs/api"
- author="true"
- version="true"
- use="true"
- windowtitle="RUBBoS API">
- <doctitle><![CDATA[<h1>RUBBoS API</h1>]]></doctitle>
- <bottom><![CDATA[<i>Copyright &#169; 2004 - ObjectWeb Consortium - All Rights Reserved.</i>]]></bottom>
- </javadoc>
- </target>
-
- <target name="clean">
- <delete dir="${classes.dir}"/>
- <delete>
- <fileset dir="${dist}" includes="rubbos_servlets.jar"/>
- </delete>
- <delete>
- <fileset dir="${dist}" includes="rubbos.war"/>
- </delete>
- <delete>
- <fileset dir="edu" includes="**/*.class"/>
- </delete>
- </target>
-
- <target name="clean-doc">
- <delete dir="docs/api"/>
- </target>
-
-</project>
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 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-
-<web-app>
-
- <display-name>RUBBos</display-name>
- <description>Rice University Bulletin Board System</description>
-
- <servlet>
- <servlet-name>BrowseCategories</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.BrowseCategories</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>BrowseStoriesByCategory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.BrowseStoriesByCategory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ViewComment</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.ViewComment</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ModerateComment</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.ModerateComment</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>PostComment</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.PostComment</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>StoreComment</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.StoreComment</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>SubmitStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.SubmitStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>AcceptStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.AcceptStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>RejectStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.RejectStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ReviewStories</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.ReviewStories</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>StoreStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.StoreStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ViewStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.ViewStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>StoriesOfTheDay</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.StoriesOfTheDay</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>Search</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.Search</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>StoreModeratorLog</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.StoreModeratorLog</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>RegisterUser</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.RegisterUser</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>Author</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.Author</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>OlderStories</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.OlderStories</servlet-class>
- </servlet>
-
-
- <servlet-mapping>
- <servlet-name>BrowseCategories</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.BrowseCategories</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>BrowseStoriesByCategory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.BrowseStoriesByCategory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ViewComment</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.ViewComment</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ModerateComment</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.ModerateComment</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>PostComment</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.PostComment</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>StoreComment</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreComment</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SubmitStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.SubmitStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AcceptStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.AcceptStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>RejectStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.RejectStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ReviewStories</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.ReviewStories</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>StoreStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ViewStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.ViewStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>StoriesOfTheDay</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.StoriesOfTheDay</url-pattern>
- </servlet-mapping>
-
-
- <servlet-mapping>
- <servlet-name>Search</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.Search</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>StoreModeratorLog</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreModeratorLog</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>RegisterUser</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.RegisterUser</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>Author</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.Author</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>OlderStories</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.OlderStories</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>30</session-timeout> <!-- 30 minutes -->
- </session-config>
-
-</web-app>
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 @@
-<?xml version="1.0"?>
-
-<xtbl name="RubbosBenchmark" version="0.1">
-
-
-<instances>
- <params>
- <env>
- <!-- Experiment name on Emulab -->
- <param name="EMULAB_EXPERIMENT_NAME" value="hanwei.infosphere.emulab.net"/>
-
- <!-- Directories from which files are copied -->
- <param name="WORK_HOME" value="/bottlenecks/rubbos/rubbos_scripts/rubbosMulini6"/>
- <param name="OUTPUT_HOME" value="/bottlenecks/rubbos/rubbos_scripts/1-1-1"/>
- <param name="SOFTWARE_HOME" value="/bottlenecks/rubbos/app_tools"/>
-
- <!-- Output directory for results of RUBBoS benchmark -->
- <param name="RUBBOS_RESULTS_HOST" value="bonn.cc.gt.atl.ga.us"/>
- <param name="RUBBOS_RESULTS_DIR_BASE" value="/bottlenecks/rubbos/rubbos_results"/>
-
- <!-- Top directories -->
- <param name="BOTTLENECKS_TOP" value="/bottlenecks"/>
- <param name="RUBBOS_TOP" value="$BOTTLENECKS_TOP/rubbos"/>
- <param name="RUBBOS_APP" value="$RUBBOS_TOP/app">
- <param name="TMP_RESULTS_DIR_BASE" value="$RUBBOS_TOP/tmp_results"/>
-
- <!-- Sysstat & Dstat-->
- <param name="SYSSTAT_HOME" value="$RUBBOS_APP/sysstat-9.0.6"/>
- <param name="SYSSTAT_TARBALL" value="sysstat-9.0.6.tar.gz"/>
- <param name="DSTAT_TARBALL" value="$SOFTWARE_HOME/dstat.tar.gz"/>
-
- <!-- Ant -->
- <param name="ANT_HOME" value="$RUBBOS_TOP/apache-ant-1.6.5"/>
- <param name="ANT_TARBALL" value="apache-ant-1.6.5.tar.gz"/>
-
- <!-- Rubbos -->
- <param name="RUBBOS_HOME" value="$RUBBOS_APP/RUBBoS"/>
- <param name="RUBBOS_TARBALL" value="RUBBoS-servlets.tar.gz"/>
- <param name="RUBBOS_DATA_TARBALL" value="rubbos_data.tar.gz"/>
- <param name="RUBBOS_DATA_TEXTFILES_TARBALL" value="smallDB-rubbos-modified.tgz"/>
-
- <!-- Java -->
- <!--jdk j2sdk-1_4_2_19-linux-i586
- <param name="JAVA_HOME" value="/mnt/elba/rubbos/jdk1.5.0_07"/>
- <param name="JAVA_OPTS" value="-Xmx1300m"/>
- <param name="JAVA_TARBALL" value="jdk1.5.0_07.tar.gz"/>
- -->
- <!-- jdk-1_5_0_7-linux-i586
- <param name="JAVA_HOME" value="/mnt/elba/rubbos/jdk1.5.0_07"/>
- <param name="JAVA_OPTS" value="-Xmx1300m"/>
- <param name="JAVA_TARBALL" value="jdk1.5.0_07.tar.gz"/>
- -->
- <!--jdk-1_5_0_22-linux-i586
- <param name="JAVA_HOME" value="/mnt/elba/rubbos/jdk1.5.0_07"/>
- <param name="JAVA_OPTS" value="-Xmx1300m"/>
- <param name="JAVA_TARBALL" value="jdk1.5.0_07.tar.gz"/>
- -->
- <!-- jdk-6u27-linux-i586 -->
- <param name="JAVA_HOME" value="$RUBBOS_APP/jdk1.6.0_27"/>
- <param name="JAVA_OPTS" value="-Xmx1300m"/>
- <param name="JAVA_TARBALL" value="jdk1.6.0_27.tar.gz"/>
- <!-- J2EE -->
- <param name="J2EE_HOME" value="$RUBBOS_APP/j2sdkee1.3.1"/>
- <param name="J2EE_TARBALL" value="j2sdkee1.3.1.jar.gz"/>
-
- <!-- Apache -->
- <param name="HTTPD_HOME" value="$RUBBOS_APP/apache2"/>
- <param name="HTTPD_INSTALL_FILES" value="$RUBBOS_APP/httpd-2.0.64"/>
- <param name="HTTPD_TARBALL" value="httpd-2.0.64.tar.gz"/>
-
- <!-- mod_jk -->
- <!-- jakarta-tomcat-connectors-1.2.15
- <param name="MOD_JK_INSTALL_FILES" value="$RUBBOS_TOP/jakarta-tomcat-connectors-1.2.15-src"/>
- <param name="MOD_JK_INSTALL_CONFIGURE" value="$MOD_JK_INSTALL_FILES/jk/native"/>
- <param name="MOD_JK_TARBALL" value="jakarta-tomcat-connectors-1.2.15-src.tar.gz"/>
- -->
- <!-- tomcat-connectors-1.2.32 -->
- <param name="MOD_JK_INSTALL_FILES" value="$RUBBOS_APP/tomcat-connectors-1.2.32-src"/>
- <param name="MOD_JK_INSTALL_CONFIGURE" value="$MOD_JK_INSTALL_FILES/native"/>
- <param name="MOD_JK_TARBALL" value="tomcat-connectors-1.2.32-src.tar.gz"/>
-
- <!-- Tomcat -->
- <!-- apache-tomcat-5.5.17 -->
- <param name="CATALINA_HOME" value="$RUBBOS_APP/apache-tomcat-5.5.17"/>
- <param name="CATALINA_BASE" value="$CATALINA_HOME"/>
- <param name="TOMCAT_TARBALL" value="apache-tomcat-5.5.17.tar.gz"/>
- <param name="SERVLET_API_PATH" value="$CATALINA_HOME/common/lib/servlet-api.jar"/>
-
- <!-- apache-tomcat-5.5.33
- <param name="CATALINA_HOME" value="/mnt/elba/rubbos/apache-tomcat-5.5.33"/>
- <param name="CATALINA_BASE" value="$CATALINA_HOME"/>
- <param name="TOMCAT_TARBALL" value="apache-tomcat-5.5.33.tar.gz"/>
- <param name="SERVLET_API_PATH" value="$CATALINA_HOME/common/lib/servlet-api.jar"/>
- -->
- <!-- apache-tomcat-6.0.33
- <param name="CATALINA_HOME" value="/mnt/elba/rubbos/apache-tomcat-6.0.33"/>
- <param name="CATALINA_BASE" value="$CATALINA_HOME"/>
- <param name="TOMCAT_TARBALL" value="apache-tomcat-6.0.33.tar.gz"/>
- <param name="SERVLET_API_PATH" value="$CATALINA_HOME/lib/servlet-api.jar"/>
- -->
- <!-- apache-tomcat-7.0.21
- <param name="CATALINA_HOME" value="/mnt/elba/rubbos/apache-tomcat-7.0.21"/>
- <param name="CATALINA_BASE" value="$CATALINA_HOME"/>
- <param name="TOMCAT_TARBALL" value="apache-tomcat-7.0.21.tar.gz"/>
- <param name="SERVLET_API_PATH" value="$CATALINA_HOME/lib/servlet-api.jar"/>
- -->
-
- <!-- C-JDBC
- <param name="CJDBC_HOME" value="$RUBBOS_TOP/c-jdbc-2.0.2-bin"/>
- <param name="CJDBC_TARBALL" value="c-jdbc-2.0.2-bin-modified.tar.gz"/>
- <param name="CJDBC_DRIVER" value="c-jdbc-driver.jar"/>
- <param name="CJDBC_CONTROLLER" value="c-jdbc-controller.jar"/>
- <param name="CJDBC_PORT" value="25322"/>
- -->
-
- <!-- Mysql -->
- <param name="MYSQL_HOME" value="$RUBBOS_APP/mysql-5.0.51a-linux-i686-glibc23"/>
- <param name="MYSQL_TARBALL" value="mysql-5.0.51a-linux-i686-glibc23.tar.gz"/>
- <param name="MYSQL_TARBALL_RT" value="mysql-5.0.51a-modified-bin.tar.gz"/>
- <param name="MYSQL_CONNECTOR" value="mysql-connector-java-5.1.7-bin.jar"/>
- <param name="MYSQL_PORT" value="3313"/>
- <param name="MYSQL_SOCKET" value="$MYSQL_HOME/mysql.sock"/>
- <param name="MYSQL_DATA_DIR" value="$MYSQL_HOME/data"/>
- <param name="MYSQL_ERR_LOG" value="$MYSQL_HOME/data/mysql.log"/>
- <param name="MYSQL_PID_FILE" value="$MYSQL_HOME/run/mysqld.pid"/>
- <param name="MYSQL_ROOT_PW" value="new-password"/>
-
- <!-- for PostgreSQL
- <param name="POSTGRES_HOME" value="$RUBBOS_TOP/pgsql"/>
- <param name="POSTGRES_INSTALL_FILES" value="$RUBBOS_TOP/postgresql-8.3.1"/>
- <param name="POSTGRES_CONNECTOR" value="postgresql-8.3-603.jdbc3.jar"/>
- <param name="POSTGRES_DATA_DIR" value="$POSTGRES_HOME/data"/>
- -->
-
- <!-- for DBs & C-JDBC -->
- <param name="ROOT_PASSWORD" value="new-password"/>
- <param name="ELBA_USER" value="elba"/>
- <param name="ELBA_PASSWORD" value="elba"/>
-
- </env>
-
- <workloads>
- <param name="workload" value="200"/>
- <param name="workload" value="300"/>
- <param name="workload" value="400"/>
- <param name="workload" value="500"/>
- <param name="workload" value="600"/>
- <param name="workload" value="700"/>
- <param name="workload" value="800"/>
- <param name="workload" value="900"/>
- <param name="workload" value="1000"/>
- <param name="workload" value="1100"/>
- <param name="workload" value="1200"/>
- <param name="workload" value="1300"/>
- <param name="workload" value="1400"/>
- <param name="workload" value="1500"/>
- <param name="workload" value="1600"/>
- <param name="workload" value="1700"/>
- </workloads>
-
- <rubbos-conf>
- <param name="connectionPoolSize" value="12"/>
- <param name="upRampTime" value="480000"/>
- <param name="runTime" value="720000"/>
- <param name="downRampTime" value="30000"/>
- <param name="removeBinFiles" value="true"/>
- <param name="MON_FREQUENCY" value="1" />
- <param name="sarMonitor" value="false"/>
- <param name="psMonitor" value="false"/>
- <param name="iostatMonitor" value="true"/>
- <param name="connectionTimeoutValue" value="300"/>
- </rubbos-conf>
-
- <apache-conf>
- <param name="Timeout" value="5"/>
- <param name="KeepAlive" value="Off"/>
- <param name="MaxKeepAliveRequests" value="100"/>
- <param name="ServerLimit" value="200"/>
- <param name="ThreadLimit" value="300"/>
- <param name="StartServers" value="1"/>
- <param name="MaxClients" value="300"/>
- <param name="MinSpareThreads" value="5"/>
- <param name="MaxSpareThreads" value="50"/>
- <param name="ThreadsPerChild" value="150"/>
- <param name="MaxRequestsPerChild" value="0"/>
- </apache-conf>
-
- <tomcat-conf>
- <param name="maxThreads" value="330"/>
- <param name="minSpareThreads" value="5"/>
- <param name="maxSpareThreads" value="50"/>
- <param name="acceptCount" value="6000"/>
- </tomcat-conf>
-
- <cjdbc-conf>
- <param name="initPoolSize" value="30"/>
- <param name="minPoolSize" value="25"/>
- <param name="maxPoolSize" value="90"/>
- <param name="idleTimeout" value="30"/>
- <param name="waitTimeout" value="10"/>
- <param name="waitForCompletion" value="all"/>
- <!-- "all" or "first", "first" is default" -->
- <param name="loadBalancing" value="LeastPendingRequestsFirst"/>
- <!-- "LeastPendingRequestsFirst" or "RoundRobin", "LeastPendingRequestsFirst" is default" -->
- </cjdbc-conf>
-
- <!--
- <postgres-conf>
- <param name="max_connections" value="150"/>
- <param name="shared_buffers" value="24MB"/>
- <param name="max_fsm_pages" value="153600"/>
- <param name="checkpoint_segments" value="16"/>
- </postgres-conf>
- -->
- <logging>
- <param name="apacheResponseTime" value="false"/>
- <param name="tomcatResponseTime" value="false"/>
- <param name="cjdbcResponseTime" value="false"/>
- <param name="mysqlResponseTime" value="false"/>
- </logging>
-
- </params>
-
- <instance name="CONTROL" type="control_server">
- <target>node1</target>
- <action type="checkScp_exec" seq="1" template="../templates/DeployScript/check_scp.xsl" />
- <action type="emulabConf_exec" seq="2" template="../templates/DeployScript/emulab_config.xsl" />
- <action type="rubbos_exec" seq="250" template="../templates/DeployScript/RUBBOSexecution.xsl" />
- </instance>
-
- <instance name="BENCHMARK" type="benchmark_server">
- <target>node2</target>
- <action type="rubbos_install" seq="19" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="install" seq="21" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
- <action type="configure" seq="104" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
- <action type="uninstall" seq="401" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
- <action type="rubbos_uninstall" seq="402" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- </instance>
-
- <instance name="CLIENT1" type="client_server">
- <target>node3</target>
- <action type="rubbos_install" seq="20" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="install" seq="22" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
- <action type="configure" seq="105" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
- <action type="uninstall" seq="403" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
- <action type="rubbos_uninstall" seq="404" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- </instance>
-
- <instance name="CLIENT2" type="client_server">
- <target>node4</target>
- <action type="rubbos_install" seq="20" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="install" seq="22" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
- <action type="configure" seq="105" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
- <action type="uninstall" seq="403" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
- <action type="rubbos_uninstall" seq="404" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- </instance>
-
- <instance name="CLIENT3" type="client_server">
- <target>node5</target>
- <action type="rubbos_install" seq="20" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="install" seq="22" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
- <action type="configure" seq="105" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
- <action type="uninstall" seq="403" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
- <action type="rubbos_uninstall" seq="404" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- </instance>
-
- <instance name="CLIENT4" type="client_server">
- <target>node6</target>
- <action type="rubbos_install" seq="20" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="install" seq="22" template="../templates/DeployScript/RUBBOS_CLIENTinstall.xsl" />
- <action type="configure" seq="105" template="../templates/DeployScript/RUBBOS_CLIENTconfigure.xsl" />
- <action type="uninstall" seq="403" template="../templates/DeployScript/RUBBOS_CLIENTuninstall.xsl" />
- <action type="rubbos_uninstall" seq="404" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- </instance>
-
- <instance name="HTTPD" type="web_server">
- <target>node7</target>
- <action type="install" seq="14" template="../templates/DeployScript/WEBinstall.xsl" />
- <action type="rubbos_install" seq="18" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="configure" seq="103" template="../templates/DeployScript/WEBconfigure.xsl" />
- <action type="ignition" seq="204" template="../templates/DeployScript/WEBignition.xsl" />
- <action type="stop" seq="301" template="../templates/DeployScript/WEBstop.xsl" />
- <action type="rubbos_uninstall" seq="405" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- <action type="uninstall" seq="406" template="../templates/DeployScript/WEBuninstall.xsl" />
- </instance>
-
- <instance name="TOMCAT1" type="app_server">
- <target>node8</target>
- <action type="install" seq="13" template="../templates/DeployScript/TOMCATinstall.xsl"/>
- <action type="rubbos_install" seq="17" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="configure" seq="102" template="../templates/DeployScript/TOMCATconfigure.xsl" />
- <action type="rubbosSL_configure" seq="106" template="../templates/DeployScript/RUBBOS_SERVLETconfigure.xsl" />
- <action type="ignition" seq="203" template="../templates/DeployScript/TOMCATignition.xsl" />
- <action type="stop" seq="302" template="../templates/DeployScript/TOMCATstop.xsl" />
- <action type="rubbos_uninstall" seq="407" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- <action type="uninstall" seq="408" template="../templates/DeployScript/TOMCATuninstall.xsl" />
- </instance>
-
- <!--
- <instance name="TOMCAT2" type="app_server">
- <target>node9</target>
- <action type="install" seq="13" template="../templates/DeployScript/TOMCATinstall.xsl"/>
- <action type="rubbos_install" seq="17" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="configure" seq="102" template="../templates/DeployScript/TOMCATconfigure.xsl" />
- <action type="rubbosSL_configure" seq="106" template="../templates/DeployScript/RUBBOS_SERVLETconfigure.xsl" />
- <action type="ignition" seq="203" template="../templates/DeployScript/TOMCATignition.xsl" />
- <action type="stop" seq="302" template="../templates/DeployScript/TOMCATstop.xsl" />
- <action type="rubbos_uninstall" seq="407" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- <action type="uninstall" seq="408" template="../templates/DeployScript/TOMCATuninstall.xsl" />
- </instance>
-
- <instance name="CJDBC" type="cjdbc_server">
- <swname>CJDBC_Controller</swname>
- <target>node10</target>
- <action type="install" seq="12" template="../templates/DeployScript/CJDBC_CONTROLLERinstall.xsl" />
- <action type="rubbos_install" seq="16" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="ignition" seq="202" template="../templates/DeployScript/CJDBC_CONTROLLERignition.xsl" />
- <action type="stop" seq="303" template="../templates/DeployScript/CJDBC_CONTROLLERstop.xsl" />
- <action type="rubbos_uninstall" seq="409" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- <action type="uninstall" seq="410" template="../templates/DeployScript/CJDBC_CONTROLLERuninstall.xsl" />
- </instance>
- -->
-
- <instance name="MYSQL1" type="db_server">
- <target>node9</target>
- <action type="install" seq="11" template="../templates/DeployScript/MYSQLinstall.xsl" />
- <action type="rubbos_install" seq="15" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="configure" seq="101" template="../templates/DeployScript/MYSQLconfigure.xsl" />
- <action type="reset" seq="150" template="../templates/DeployScript/MYSQLreset.xsl" />
- <action type="ignition" seq="201" template="../templates/DeployScript/MYSQLignition.xsl" />
- <action type="stop" seq="304" template="../templates/DeployScript/MYSQLstop.xsl" />
- <action type="rubbos_uninstall" seq="411" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- <action type="uninstall" seq="412" template="../templates/DeployScript/MYSQLuninstall.xsl" />
- </instance>
- <!--
- <instance name="MYSQL2" type="db_server">
- <target>node12</target>
- <action type="install" seq="11" template="../templates/DeployScript/MYSQLinstall.xsl" />
- <action type="rubbos_install" seq="15" template="../templates/DeployScript/RUBBOSinstall.xsl" />
- <action type="configure" seq="101" template="../templates/DeployScript/MYSQLconfigure.xsl" />
- <action type="reset" seq="150" template="../templates/DeployScript/MYSQLreset.xsl" />
- <action type="ignition" seq="201" template="../templates/DeployScript/MYSQLignition.xsl" />
- <action type="stop" seq="304" template="../templates/DeployScript/MYSQLstop.xsl" />
- <action type="rubbos_uninstall" seq="411" template="../templates/DeployScript/RUBBOSuninstall.xsl" />
- <action type="uninstall" seq="412" template="../templates/DeployScript/MYSQLuninstall.xsl" />
- </instance>
- -->
-</instances>
-
-</xtbl>
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 <code>Config</code> 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 @@
-
-
-<project name="RUBBoS Servlets" default="dist" basedir=".">
- <!-- RUBBoS Servlets Ant build file -->
-
- <!-- set global properties for this build -->
- <property file="../build.properties" />
- <property name="servlets.html" value="../Servlet_HTML" />
-
-<!-- ====================================================================== -->
-<!-- Init -->
-<!-- ====================================================================== -->
-
- <!-- init rule creates build directory -->
- <target name="init">
- <!-- Create the time stamp -->
- <tstamp/>
- <!-- Create the build directory structure used by compile -->
- <mkdir dir="${classes.dir}"/>
- </target>
-
-<!-- ====================================================================== -->
-<!-- Servlets -->
-<!-- ====================================================================== -->
-
- <!-- The classpath to be used to compile -->
- <path id="base.classpath">
- <pathelement location="${classes.dir}" />
- <fileset dir="${j2ee}/lib">
- <include name="j2ee.jar"/>
- </fileset>
- </path>
-
- <!-- Creates a jar file containing the servlets -->
- <target name="jar" depends="init, compile">
- <jar destfile="${dist}/rubbos_servlets.jar">
- <fileset dir="${classes.dir}"
- includes="edu/rice/rubbos/servlets/*.class"/>
- </jar>
- </target>
-
- <!-- Create a war file-->
- <target name="war" depends="init, compile, jar">
- <copy file="${dist}/rubbos_servlets.jar" todir="${servlets.html}/WEB-INF/lib"/>
- <copy file="${j2ee}/lib/j2ee.jar" todir="${servlets.html}/WEB-INF/lib"/>
-
- <copy file="${mysql_connector}" todir="${servlets.html}/WEB-INF/lib"/>
-
- <war destfile="${dist}/rubbos.war" webxml="${servlets.html}/WEB-INF/web.xml" basedir="${web.dir}">
- <fileset dir="${classes.dir}"
- includes="*" excludes="**/web.xml" />
- </war>
- </target>
-
- <!-- Dist rule -->
- <target name="dist" depends="init, compile, jar, war">
- </target>
-
- <!-- compile rule: Compile the beans and the servlets -->
- <target name="compile" depends="init">
- <javac srcdir="${src}"
- includes="edu/rice/rubbos/servlets/*"
- destdir="${classes.dir}"
- classpath="${build.classpath}"
- depend="yes"
- deprecation="yes">
- <classpath refid="base.classpath" />
- </javac>
- </target>
-
-<!-- ====================================================================== -->
-<!-- Javadoc -->
-<!-- ====================================================================== -->
-
- <!-- Generate Javadoc documentation -->
- <target name="doc">
- <mkdir dir="docs/api"/>
- <javadoc classpathref="base.classpath"
- packagenames="edu.rice.rubbos.*.*"
- sourcepath="."
- defaultexcludes="yes"
- destdir="docs/api"
- author="true"
- version="true"
- use="true"
- windowtitle="RUBBoS API">
- <doctitle><![CDATA[<h1>RUBBoS API</h1>]]></doctitle>
- <bottom><![CDATA[<i>Copyright &#169; 2004 - ObjectWeb Consortium - All Rights Reserved.</i>]]></bottom>
- </javadoc>
- </target>
-
-<!-- ====================================================================== -->
-<!-- Clean -->
-<!-- ====================================================================== -->
-
- <target name="clean">
- <!-- Delete the ${classes.dir} and ${dist} directory trees -->
- <delete dir="${classes.dir}"/>
- <delete>
- <fileset dir="${dist}" includes="rubbos_servlets.jar"/>
- </delete>
- <delete>
- <fileset dir="${dist}" includes="rubbos.war"/>
- </delete>
- <delete>
- <fileset dir="edu" includes="**/*.class"/>
- </delete>
- </target>
-
- <target name="clean-doc">
- <delete dir="docs/api"/>
- </target>
-</project>
-
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 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-
-<web-app>
-
- <display-name>RUBBos</display-name>
- <description>
- Rice University Bulletin Board System
- </description>
-
-
- <servlet>
- <servlet-name>BrowseCategories</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.BrowseCategories</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>BrowseStoriesByCategory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.BrowseStoriesByCategory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ViewComment</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.ViewComment</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ModerateComment</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.ModerateComment</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>PostComment</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.PostComment</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>StoreComment</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.StoreComment</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>SubmitStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.SubmitStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>AcceptStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.AcceptStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>RejectStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.RejectStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ReviewStories</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.ReviewStories</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>StoreStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.StoreStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>ViewStory</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.ViewStory</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>StoriesOfTheDay</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.StoriesOfTheDay</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>Search</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.Search</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>StoreModeratorLog</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.StoreModeratorLog</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>RegisterUser</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.RegisterUser</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>Author</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.Author</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>OlderStories</servlet-name>
- <servlet-class>edu.rice.rubbos.servlets.OlderStories</servlet-class>
- </servlet>
-
-
- <servlet-mapping>
- <servlet-name>BrowseCategories</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.BrowseCategories</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>BrowseStoriesByCategory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.BrowseStoriesByCategory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ViewComment</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.ViewComment</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ModerateComment</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.ModerateComment</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>PostComment</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.PostComment</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>StoreComment</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreComment</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SubmitStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.SubmitStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>AcceptStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.AcceptStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>RejectStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.RejectStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ReviewStories</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.ReviewStories</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>StoreStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>ViewStory</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.ViewStory</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>StoriesOfTheDay</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.StoriesOfTheDay</url-pattern>
- </servlet-mapping>
-
-
- <servlet-mapping>
- <servlet-name>Search</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.Search</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>StoreModeratorLog</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.StoreModeratorLog</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>RegisterUser</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.RegisterUser</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>Author</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.Author</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>OlderStories</servlet-name>
- <url-pattern>/servlet/edu.rice.rubbos.servlets.OlderStories</url-pattern>
- </servlet-mapping>
-
-
- <session-config>
- <session-timeout>30</session-timeout> <!-- 30 minutes -->
- </session-config>
-
-</web-app>
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 @@
-
-<Server port="8005" shutdown="SHUTDOWN">
-
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
-
- <!-- Global JNDI resources -->
- <GlobalNamingResources>
-
- <!-- Test entry for demonstration purposes -->
- <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
- <!-- Editable user database that can also be used by
- UserDatabaseRealm to authenticate users -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
-
- </GlobalNamingResources>
-
-
- <!-- Define the Tomcat Stand-Alone Service -->
- <Service name="Catalina">
-
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Each Connector passes requests on to the
- associated "Container" (normally an Engine) for processing.
- -->
-
- <!-- Define a non-SSL HTTP/1.1 Connector on port 2117 (default 8080) -->
- <Connector port="8080" maxHttpHeaderSize="8192"
- maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
- enableLookups="false" redirectPort="8443" acceptCount="6000"
- connectionTimeout="20000" disableUploadTimeout="true" />
-
- <!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009"
- maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
- acceptCount="6000" redirectPort="8443" protocol="AJP/1.3" />
-
- <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
- <!-- See proxy documentation for more information about using this. -->
- <!--
- <Connector port="8082"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" acceptCount="100" connectionTimeout="20000"
- proxyPort="80" disableUploadTimeout="true" />
- -->
-
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host). -->
-
- <!-- Define the top level container in our container hierarchy -->
- <Engine jvmRoute="TOMCAT1" name="Catalina" defaultHost="localhost">
-
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
-
- <!-- Define the default virtual host -->
-
- <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
-
- <!-- <Context path="" docBase="webapps" debug="0" reloadable="true"/> -->
-
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common" resolveHosts="false"/>
- </Host>
-
-
- </Engine>
-
- </Service>
-
-</Server>
-
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
index e0e63bb3..071c7ad9 100755..100644
--- 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
index c7fc2116..8970d48d 100755..100644
--- 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
index 4ab2bdd0..c0a07433 100755..100644
--- 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
index e0e63bb3..071c7ad9 100755..100644
--- 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
index 78c49906..c0a07433 100755..100644
--- 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
index e0e63bb3..071c7ad9 100755..100644
--- 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
index c7fc2116..8970d48d 100755..100644
--- 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
index 9e066b16..f6880c81 100755..100644
--- 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
index b69abfd7..67d4c180 100755..100644
--- 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 ,