diff options
| author |   Yu Yang (Gabriel) <Gabriel.yuyang@huawei.com> | 2017-03-10 08:24:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-10 08:24:57 +0000 |
| commit | 0300c5099b234fe02330c16ea06856dadf72fc8f (patch) | |
| tree | 26f1b6245bba3f249051edcf50dfe9a4887075bc | |
| parent | bd80bcfb59a948d47af4d970f2832e8079f5f0f0 (diff) | |
| parent | c5162f01bb54eab6b3c4056074e28e0080dc4d08 (diff) | |
Merge "Add liscense to file headers"
62 files changed, 172 insertions, 5442 deletions
diff --git a/config/__init__.py b/config/__init__.py index b124dfa9..e69de29b 100644 --- a/config/__init__.py +++ b/config/__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/config/bottlenecks_cfg.yaml b/config/bottlenecks_cfg.yaml index c12ec9d6..32624d16 100755..100644 --- a/config/bottlenecks_cfg.yaml +++ b/config/bottlenecks_cfg.yaml @@ -1 +1,10 @@ +############################################################################## +# 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 +############################################################################## + suite_prefix_config: /home/opnfv/bottlenecks/testsuites diff --git a/config/config.yaml b/config/config.yaml index 702a0c8c..19ffa4ce 100644 --- a/config/config.yaml +++ b/config/config.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 +############################################################################## + common_config: log_dir: '/tmp/' rc_dir: '/tmp/admin_rc.sh' 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 © 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 © 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 , diff --git a/utils/__init__.py b/utils/__init__.py index b124dfa9..e69de29b 100644 --- a/utils/__init__.py +++ b/utils/__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/utils/dashboard/dashboard.yaml b/utils/dashboard/dashboard.yaml index 0668e370..016c6d8d 100644 --- a/utils/dashboard/dashboard.yaml +++ b/utils/dashboard/dashboard.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 +############################################################################## + --- pod_name: REPLACE_NODE_NAME diff --git a/utils/dev_env/deploy/create_libvirt_vm.sh b/utils/dev_env/deploy/create_libvirt_vm.sh deleted file mode 100755 index 45ba2b8e..00000000 --- a/utils/dev_env/deploy/create_libvirt_vm.sh +++ /dev/null @@ -1,237 +0,0 @@ -#!/bin/bash -############################################################################## -# 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 -############################################################################## - - -############################################## -# Usage: ./deploy.sh paras_conf outout_dir -############################################## -SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd) -tool_dir=${0%/*} - -function print_usage() -{ - echo "Usage: ./deploy.sh paras_conf output_dir" -} - -## sanity check -if [ ! -f $tool_dir/mac_generator.sh ] || \ - [ ! -f $tool_dir/libvirt_template.xml ] || \ - [ ! -f $tool_dir/meta-data.template ] || \ - [ ! -f $tool_dir/user-data.template ] || \ - [ ! -f $tool_dir/p-master-user-data.template ] || \ - [ ! -f $tool_dir/p-agent-user-data.template ]; then - echo "Lack some necessary files for this tool!" - echo "deploy.sh" - echo "mac_generator.sh" - echo "1 xml, and 4 template" - exit 1 -fi - -## Check input -if [ $# != 2 ]; then - print_usage - exit 1 -fi -if [ ! -f $1 ]; then - echo "Cannot find file: "$1 - exit 1 -fi -if [ -d $2 ]; then - echo "Ouput dir $2 exist!" - exit 1 -fi - -## Assign parameters -host_names="" -puppet_enable="true" -master_host="" -vm_mem= -vm_cpu_cores= -image_url= -image_name= -ipaddr_start= -trusted_ssh_pub_keys_file= -while read line -do - line=(${line//=/ }) - case ${line[0]} in - "host_names" ) - host_names=${line[1]} - ;; - "puppet_enable" ) - puppet_enable=${line[1]} - ;; - "master_host" ) - master_host=${line[1]} - ;; - "vm_mem" ) - vm_mem=${line[1]} - ;; - "vm_cpu_cores" ) - vm_cpu_cores=${line[1]} - ;; - "image_url" ) - image_url=${line[1]} - ;; - "image_name" ) - image_name=${line[1]} - ;; - "ipaddr_start" ) - ipaddr_start=${line[1]} - ;; - "trusted_ssh_pub_keys_file" ) - trusted_ssh_pub_keys_file=${line[1]} - ;; - esac -done < $1 - -echo "puppet_enable="$puppet_enable - -# Check parameters in conf file -if [ $puppet_enable == "true" ] ; then - if [ ${#master_host} == 0 ];then - echo "Should specify master_host!" - exit 1 - else - result=$(echo ${host_names} | grep "${master_host}") - if [ ${result} == "" ]; then - echo "Specified master_host is invalid!" - exit 1 - fi - fi -fi - -# Define and Prepare needed data -mac_arr= -hostname_arr=(${host_names//,/ }) -virt_num=${#hostname_arr[@]} -ip_arr=() -replaced_hosts="" -replaced_ssh_keys="" -output_dir=$2 -work_dir= -host_vm_dir= -cache_dir= -function init(){ - # Generate mac address - local mac_generator=${tool_dir}/mac_generator.sh - chmod +x $mac_generator - mac_str=$($mac_generator $virt_num) - mac_arr=($mac_str) - - # Generate hosts info - local ip="" - i=0 - for host in "${hostname_arr[@]}"; do - ip=${ipaddr_prefix}$((i+$ipaddr_idx)) - ip_arr+=($ip) - # Note the format, especially the space - replaced_hosts=${replaced_hosts}" "${ip}" "${host}"\n" - let i=i+1 - done - - # Generate ssh public keys - echo "## trusted_ssh_pub_keys_file --> "${trusted_ssh_pub_keys_file} - if [ ${trusted_ssh_pub_keys_file} != "" ] && [ -f ${trusted_ssh_pub_keys_file} ]; then - while read line - do - # Note the format, especially space - replaced_ssh_keys=${replaced_ssh_keys}" - "${line}"\n" - done < ${trusted_ssh_pub_keys_file} - # delete last "\n" in replaced_ssh_keysi - replaced_ssh_keys=${replaced_ssh_keys%\\n} - fi - - # Prepare needed folder and files - if [ ${output_dir:0-1} == "/" ]; then - output_dir=${output_dir%/*} - fi - output_file=$output_dir/hosts.info - mkdir -p $output_dir - touch $output_file - echo "## Output host_info file --> "$output_file - - work_dir=$output_dir/work - host_vm_dir=$work_dir/vm - cache_dir=$work_dir/cache - mkdir -p $work_dir - mkdir -p $host_vm_dir - mkdir -p $cache_dir - - # Cache img file - echo "## Cache img file" - curl --connect-timeout 10 -o ${cache_dir}/$image_name $image_url -} - -# Bring up instances/vms -sub_ip_arr=(${ipaddr_start//./ }) -ipaddr_prefix=${sub_ip_arr[0]}"."${sub_ip_arr[1]}"."${sub_ip_arr[2]}"." -ipaddr_idx=${sub_ip_arr[3]} -function bring_up() { - i=0 - while (($i < $virt_num)) - do - echo "Bring up a vm, hostname: ${hostname_arr[$i]}, ip: ${ip_arr[$i]}, mac: ${mac_arr[$i]}" - vm_dir=$host_vm_dir/${hostname_arr[$i]} - mkdir -p $vm_dir - cp ${cache_dir}/$image_name $vm_dir - - sed -e "s/REPLACE_IPADDR/${ip_arr[$i]}/g" \ - -e "s/REPLACE_GATEWAY/${ipaddr_prefix}1/g" \ - -e "s/REPLACE_HOSTNAME/${hostname_arr[$i]}/g" \ - ${tool_dir}/meta-data.template > ${cache_dir}/meta-data - - if [ ${puppet_enable} == "true" ]; then - # Use puppet user data - echo "hostname: "${hostname_arr[$i]} - if [ ${hostname_arr[$i]} == ${master_host} ]; then - cp ${tool_dir}/p-master-user-data.template ${cache_dir}/user-data.template - else - cp ${tool_dir}/p-agent-user-data.template ${cache_dir}/user-data.templatate - fi - sed -e "s#REPLACED_TRUSTED_PUB_SSH_KEYS#${replaced_ssh_keys}#g" \ - -e "s#REPLACED_HOSTS_INFO#${replaced_hosts}#g" \ - -e "s/REPLACED_PUPPET_MASTER_SERVER/${master_host}/g" \ - ${cache_dir}/user-data.template > ${cache_dir}/user-data - else - # Use common user data - echo "## Use common user-data.template" - cp ${tool_dir}/user-data.template ${cache_dir}/user-data - fi - - genisoimage -output seed.iso -volid cidata -joliet -rock ${cache_dir}/user-data ${cache_dir}/meta-data - mv seed.iso ${vm_dir}/ - # Create vm xml - sed -e "s/REPLACE_MEM/$vm_mem/g" \ - -e "s/REPLACE_CPU/$vm_cpu_cores/g" \ - -e "s/REPLACE_NAME/${hostname_arr[$i]}/g" \ - -e "s#REPLACE_IMAGE#$vm_dir/disk.img#g" \ - -e "s#REPLACE_SEED_IMAGE#$vm_dir/seed.iso#g" \ - -e "s/REPLACE_MAC_ADDR/${mac_arr[$i]}/g" \ - ${tool_dir}/libvirt_template.xml > ${vm_dir}/libvirt.xml - - echo "${ip_arr[$i]} ${hostname_arr[$i]}" >> $output_file - - echo "Will define xml from:"${vm_dir}"/libvirt.xml" - echo "start: "${hostname_arr[$i]} - sudo virsh define ${vm_dir}/libvirt.xml - sudo virsh start ${hostname_arr[$i]} - let i=i+1 - rm -rf ${cache_dir}/meta-data ${cache_dir}/user-data - done -} - -function clean(){ - rm -rf ${cache_dir} -} - -init -bring_up -clean diff --git a/utils/dev_env/deploy/libvirt_template.xml b/utils/dev_env/deploy/libvirt_template.xml deleted file mode 100644 index eddeff00..00000000 --- a/utils/dev_env/deploy/libvirt_template.xml +++ /dev/null @@ -1,41 +0,0 @@ -<domain type='kvm'> - <name>REPLACE_NAME</name> - <memory unit='MiB'>REPLACE_MEM</memory> - <currentMemory unit='MiB'>REPLACE_MEM</currentMemory> - <vcpu placement='static'>REPLACE_CPU</vcpu> - <os> - <type arch='x86_64'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <acpi/><apic/><pae/> - </features> - <clock offset="utc"/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='REPLACE_IMAGE'/> - <target dev='vda' bus='virtio'/> - </disk> - <disk type='file' device='cdrom'> - <driver name='qemu'/> - <source file='REPLACE_SEED_IMAGE'/> - <target dev='hdb'/> - <readonly/> - </disk> - <interface type='network'> - <source network='default'/> - <mac address='REPLACE_MAC_ADDR'/> - <model type='virtio'/> - </interface> - <input type='tablet' bus='usb'/> - <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/> - <console type='pty'/> - <video> - <model type='cirrus'/> - </video> - </devices> -</domain> diff --git a/utils/dev_env/deploy/mac_generator.sh b/utils/dev_env/deploy/mac_generator.sh deleted file mode 100755 index f8bc5e08..00000000 --- a/utils/dev_env/deploy/mac_generator.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -############################################################################## -# 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 -############################################################################## - - -## This script is used in 'create_libvirt_vm.sh' -function mac_address_part() { - hex_number=$(printf '%02x' $RANDOM) - number_length=${#hex_number} - number_start=$(expr $number_length - 2) - echo ${hex_number:$number_start:2} -} - -function mac_address() { - echo "00:00:$(mac_address_part):$(mac_address_part):$(mac_address_part):$(mac_address_part)" -} - -machines='' -for i in `seq $1`; do - mac=$(mac_address) - - if [[ -z $machines ]]; then - machines="${mac}" - else - machines="${machines} ${mac}" - fi -done - -echo ${machines} diff --git a/utils/dev_env/deploy/meta-data.template b/utils/dev_env/deploy/meta-data.template deleted file mode 100644 index 43db6597..00000000 --- a/utils/dev_env/deploy/meta-data.template +++ /dev/null @@ -1,11 +0,0 @@ -instance-id: iid-abcdeff -network-interfaces: | - # The primary network interface - auto eth0 - iface eth0 inet static - address REPLACE_IPADDR - netmask 255.255.255.0 - gateway REPLACE_GATEWAY - dns-nameservers 8.8.8.8 -local-hostname: REPLACE_HOSTNAME - diff --git a/utils/dev_env/deploy/p-agent-user-data.template b/utils/dev_env/deploy/p-agent-user-data.template deleted file mode 100644 index 3d778f1a..00000000 --- a/utils/dev_env/deploy/p-agent-user-data.template +++ /dev/null @@ -1,40 +0,0 @@ -#cloud-config - -users: - - name: ubuntu - ssh-authorized-keys: -REPLACED_TRUSTED_PUB_SSH_KEYS - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwmx8/86Vc1yqqplMPkm/w6wB2r5Yl6CjON85Ko5SzPEpnysJwO5ygbMClQTbzCUztIpFeO8D6xdWlhPmhMEJIWtRh+Dx0swB+ByMraGTP92xxKo2ukWzYI6eu25LmJX+a1lmVPmewQq+6dPzIwgCZvwD8UVe5L+d0EP2rb3iniQVoBzksUmhL3N6jp2Lgpscfi1yXFgjFdLpDsCcFcM+Q6wQUC2+qGBYa5RxqercWzISSbvAsYwC7UepmjFpcj3W/WX2QcOCDIlAzeURvC8PbOdzCtgeMhuhH2499BcIUSzPMpjzvpRiHr5SeF/zrPeW+2Ei1MfHi1qrBCxS8JBqt bottlenecks@bottlenecks.opnfv.org - sudo: ['ALL=(ALL) NOPASSWD:ALL'] - groups: sudo - shell: /bin/bash - -runcmd: - - restart ssh - - wget https://apt.puppetlabs.com/puppetlabs-release-trusty.deb - - sudo dpkg -i puppetlabs-release-trusty.deb - - sudo apt-get update - - sudo apt-get -y install puppet - - sed -i '/^factpath/a basemodulepath=\/etc\/puppet\/modules' /etc/puppet/puppet.conf - - sed -i '/^factpath/a server=REPLACED_PUPPET_MASTER_SERVER' /etc/puppet/puppet.conf - - sed -i '/^factpath/a runinterval=1d' /etc/puppet/puppet.conf - - sed -i '/^templatedir/d' /etc/puppet/puppet.conf - - sed -i 's/START=no/START=yes/g' /etc/default/puppet - -write_files: - - path: /etc/hosts - content: | - 127.0.0.1 localhost - - # The following lines are desirable for IPv6 capable hosts - ::1 ip6-localhost ip6-loopback - fe00::0 ip6-localnet - ff00::0 ip6-mcastprefix - ff02::1 ip6-allnodes - ff02::2 ip6-allrouters - ff02::3 ip6-allhosts - - # hosts info for all vms -REPLACED_HOSTS_INFO - -final_message: "The system with puppet is finally up, after $UPTIME seconds." diff --git a/utils/dev_env/deploy/p-master-user-data.template b/utils/dev_env/deploy/p-master-user-data.template deleted file mode 100644 index 446c9698..00000000 --- a/utils/dev_env/deploy/p-master-user-data.template +++ /dev/null @@ -1,39 +0,0 @@ -#cloud-config - -users: - - name: ubuntu - ssh-authorized-keys: -REPLACED_TRUSTED_PUB_SSH_KEYS - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwmx8/86Vc1yqqplMPkm/w6wB2r5Yl6CjON85Ko5SzPEpnysJwO5ygbMClQTbzCUztIpFeO8D6xdWlhPmhMEJIWtRh+Dx0swB+ByMraGTP92xxKo2ukWzYI6eu25LmJX+a1lmVPmewQq+6dPzIwgCZvwD8UVe5L+d0EP2rb3iniQVoBzksUmhL3N6jp2Lgpscfi1yXFgjFdLpDsCcFcM+Q6wQUC2+qGBYa5RxqercWzISSbvAsYwC7UepmjFpcj3W/WX2QcOCDIlAzeURvC8PbOdzCtgeMhuhH2499BcIUSzPMpjzvpRiHr5SeF/zrPeW+2Ei1MfHi1qrBCxS8JBqt bottlenecks@bottlenecks.opnfv.org - sudo: ['ALL=(ALL) NOPASSWD:ALL'] - groups: sudo - shell: /bin/bash - -runcmd: - - restart ssh - - wget https://apt.puppetlabs.com/puppetlabs-release-trusty.deb - - sudo dpkg -i puppetlabs-release-trusty.deb - - sudo apt-get update - - sudo apt-get -y install puppetserver - - sed -i '/^factpath/a basemodulepath=\/etc\/puppet\/modules' /etc/puppet/puppet.conf - - sed -i '/^factpath/a server=REPLACED_PUPPET_MASTER_SERVER' /etc/puppet/puppet.conf - - sed -i '/^factpath/a runinterval=1d' /etc/puppet/puppet.conf - - sed -i '/^templatedir/d' /etc/puppet/puppet.conf - -write_files: - - path: /etc/hosts - content: | - 127.0.0.1 localhost - - # The following lines are desirable for IPv6 capable hosts - ::1 ip6-localhost ip6-loopback - fe00::0 ip6-localnet - ff00::0 ip6-mcastprefix - ff02::1 ip6-allnodes - ff02::2 ip6-allrouters - ff02::3 ip6-allhosts - - # hosts info for all vms -REPLACED_HOSTS_INFO - -final_message: "The system with puppet is finally up, after $UPTIME seconds." diff --git a/utils/dev_env/deploy/user-data.template b/utils/dev_env/deploy/user-data.template deleted file mode 100644 index 8692cde1..00000000 --- a/utils/dev_env/deploy/user-data.template +++ /dev/null @@ -1 +0,0 @@ -#cloud-config diff --git a/utils/dev_env/paras.conf b/utils/dev_env/paras.conf deleted file mode 100644 index 1ebf104a..00000000 --- a/utils/dev_env/paras.conf +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################## -# 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 -############################################################################## - - -## This is a sample configuration file, as one input parameter for 'create_libvirt_vm.sh' -host_names=test-master,test-agent -puppet_enable=true -master_host=test-master -vm_mem=4096 -vm_cpu_cores=4 -image_url=file:///home/ubuntu/trusty-server-cloudimg-amd64-btnks.img -image_name=disk.img -ipaddr_start=192.168.122.201 -trusted_ssh_pub_keys_file=/home/ubuntu/trusted_ssh_pub_keys diff --git a/utils/env_prepare/__init__.py b/utils/env_prepare/__init__.py index b124dfa9..e69de29b 100644 --- a/utils/env_prepare/__init__.py +++ b/utils/env_prepare/__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/utils/infra_setup/__init__.py b/utils/infra_setup/__init__.py index b124dfa9..e69de29b 100644 --- a/utils/infra_setup/__init__.py +++ b/utils/infra_setup/__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/utils/infra_setup/heat/__init__.py b/utils/infra_setup/heat/__init__.py index 6dbd8d79..e69de29b 100644 --- a/utils/infra_setup/heat/__init__.py +++ b/utils/infra_setup/heat/__init__.py @@ -1,8 +0,0 @@ -############################################################################## -# 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 -############################################################################## diff --git a/utils/infra_setup/heat/consts/__init__.py b/utils/infra_setup/heat/consts/__init__.py index 0854776c..e69de29b 100755 --- a/utils/infra_setup/heat/consts/__init__.py +++ b/utils/infra_setup/heat/consts/__init__.py @@ -1,12 +0,0 @@ -############################################################################## -# 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 -############################################################################## - -""" -Constants -""" diff --git a/utils/infra_setup/heat/tests/data/generated_templates/experiment_1.yaml b/utils/infra_setup/heat/tests/data/generated_templates/experiment_1.yaml deleted file mode 100644 index 53600443..00000000 --- a/utils/infra_setup/heat/tests/data/generated_templates/experiment_1.yaml +++ /dev/null @@ -1,300 +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-key - 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-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" - -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 } - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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_benchmark: - type: OS::Nova::Server - properties: - name: rubbos_benchmark - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_benchmark_port } - admin_user: ubuntu - - rubbos_benchmark_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_benchmark_private_ip: - description: IP address of rubbos_benchmark in private network - value: { get_attr: [ rubbos_benchmark, first_address ] } - diff --git a/utils/infra_setup/heat/tests/data/generated_templates/experiment_2.yaml b/utils/infra_setup/heat/tests/data/generated_templates/experiment_2.yaml deleted file mode 100644 index e69de29b..00000000 --- a/utils/infra_setup/heat/tests/data/generated_templates/experiment_2.yaml +++ /dev/null diff --git a/utils/infra_setup/heat/tests/data/generated_templates/rubbos_1-1-1_template.tmp b/utils/infra_setup/heat/tests/data/generated_templates/rubbos_1-1-1_template.tmp deleted file mode 100755 index 0f417dd3..00000000 --- a/utils/infra_setup/heat/tests/data/generated_templates/rubbos_1-1-1_template.tmp +++ /dev/null @@ -1,311 +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-key - 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-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" - -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 } - - 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: #flavor - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_control_port } - admin_user: ubuntu - - 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 - - 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 - - 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 - - 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 - - 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: #image - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client2_port } - admin_user: ubuntu - - 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 - - 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 - - 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_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 - - rubbos_benchmark: - type: OS::Nova::Server - properties: - name: rubbos_benchmark - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_benchmark_port } - admin_user: ubuntu - - rubbos_benchmark_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_benchmark_private_ip: - description: IP address of rubbos_benchmark in private network - value: { get_attr: [ rubbos_benchmark, first_address ] } - diff --git a/utils/infra_setup/heat/tests/data/test_templates/test_template_1.yaml b/utils/infra_setup/heat/tests/data/test_templates/test_template_1.yaml deleted file mode 100755 index ca347e0a..00000000 --- a/utils/infra_setup/heat/tests/data/test_templates/test_template_1.yaml +++ /dev/null @@ -1,311 +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-key - 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-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" - -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 } - - 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: medium - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_control_port } - admin_user: ubuntu - - 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 - - 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 - - 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 - - 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 - - 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: #image - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_client2_port } - admin_user: ubuntu - - 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 - - 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 - - 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_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 - - rubbos_benchmark: - type: OS::Nova::Server - properties: - name: rubbos_benchmark - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_benchmark_port } - admin_user: ubuntu - - rubbos_benchmark_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_benchmark_private_ip: - description: IP address of rubbos_benchmark in private network - value: { get_attr: [ rubbos_benchmark, first_address ] } - diff --git a/utils/infra_setup/heat/tests/generate_template_test.py b/utils/infra_setup/heat/tests/generate_template_test.py deleted file mode 100755 index 374ca30e..00000000 --- a/utils/infra_setup/heat/tests/generate_template_test.py +++ /dev/null @@ -1,83 +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 -############################################################################## - -import template -import common -import os -import unittest -import mock - -import sys -sys.path.append("..") - - -def reset_common(): - common.LOG = None - common.CONF_FILE = None - common.DEPLOYMENT_UNIT = None - common.ITERATIONS = None - common.BASE_DIR = None - common.TEMPLATE_DIR = None - common.TEMPLATE_NAME = None - common.TEMPLATE_EXTENSION = None - - -class TestGeneratesTemplate(unittest.TestCase): - - def setUp(self): - self.deployment_configuration = { - 'flavor': ['medium'] - } - self.template_name = 'rubbos_1-1-1_template.tmp' - # common.init() - - def tearDown(self): - reset_common() - - @mock.patch('common.LOG') - @mock.patch('common.get_template_dir') - def test_generates_template_for_success(self, mock_template_dir, - mock_log): - tmp_generated_templates_dir = '/data/generated_templates/' - generated_templates_dir = "{}{}".format( - os.getcwd(), tmp_generated_templates_dir) - mock_template_dir.return_value = generated_templates_dir - tmp_test_templates = '/data/test_templates/' - test_templates = "{}{}".format(os.getcwd(), tmp_test_templates) - template.generates_templates(self.template_name, - self.deployment_configuration) - for dirname, dirnames, filenames in os.walk(test_templates): - for filename in filenames: - with open(test_templates + filename) as test: - with open(generated_templates_dir + filename) as generated: - self.assertListEqual(test.readlines(), - generated.readlines()) - - t_name = '/data/generated_templates/rubbos_1-1-1_template.tmp' - self.template_name = "{}{}".format(os.getcwd(), t_name) - template.generates_templates(self.template_name, - self.deployment_configuration) - for dirname, dirnames, filenames in os.walk(test_templates): - for filename in filenames: - with open(test_templates + filename) as test: - with open(generated_templates_dir + filename) as generated: - self.assertListEqual(test.readlines(), - generated.readlines()) - - @mock.patch('common.get_template_dir') - def test_get_all_heat_templates_for_success(self, template_dir): - tmp_generated_templates = '/data/generated_templates/' - generated_templates = "{}{}".format( - os.getcwd(), tmp_generated_templates) - template_dir.return_value = generated_templates - extension = '.yaml' - expected = ['test_template_1.yaml'] - result = template.get_all_heat_templates(generated_templates, - extension) - self.assertListEqual(expected, result) diff --git a/utils/infra_setup/heat_template/rubbos_heat_template/rubbos_1-1-1_template.yaml b/utils/infra_setup/heat_template/rubbos_heat_template/rubbos_1-1-1_template.yaml deleted file mode 100755 index 53600443..00000000 --- a/utils/infra_setup/heat_template/rubbos_heat_template/rubbos_1-1-1_template.yaml +++ /dev/null @@ -1,300 +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-key - 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-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" - -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 } - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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_benchmark: - type: OS::Nova::Server - properties: - name: rubbos_benchmark - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_benchmark_port } - admin_user: ubuntu - - rubbos_benchmark_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_benchmark_private_ip: - description: IP address of rubbos_benchmark in private network - value: { get_attr: [ rubbos_benchmark, first_address ] } - diff --git a/utils/infra_setup/heat_template/rubbos_heat_template/rubbos_1-2-1_template.yaml b/utils/infra_setup/heat_template/rubbos_heat_template/rubbos_1-2-1_template.yaml deleted file mode 100755 index d76a08cd..00000000 --- a/utils/infra_setup/heat_template/rubbos_heat_template/rubbos_1-2-1_template.yaml +++ /dev/null @@ -1,321 +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-key - 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-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" - -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 } - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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_benchmark: - type: OS::Nova::Server - properties: - name: rubbos_benchmark - image: { get_param: image } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: rubbos_benchmark_port } - admin_user: ubuntu - - rubbos_benchmark_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_benchmark_private_ip: - description: IP address of rubbos_benchmark in private network - value: { get_attr: [ rubbos_benchmark, first_address ] } diff --git a/utils/infra_setup/passwordless_SSH/__init__.py b/utils/infra_setup/passwordless_SSH/__init__.py index b124dfa9..e69de29b 100644 --- a/utils/infra_setup/passwordless_SSH/__init__.py +++ b/utils/infra_setup/passwordless_SSH/__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/utils/infra_setup/runner/__init__.py b/utils/infra_setup/runner/__init__.py index b124dfa9..e69de29b 100644 --- a/utils/infra_setup/runner/__init__.py +++ b/utils/infra_setup/runner/__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 -############################################################################## |