From 15d7e4d7ca535235cce9a4a8dfaab12ff662263d Mon Sep 17 00:00:00 2001 From: Mikhail Dubov Date: Thu, 23 Apr 2015 01:10:32 +0300 Subject: [PATCH] Add Rally This application installs a single VM instance for Rally, official OpenStack benchmarking and performance analysis tool. Change-Id: I21b5008f4ca0498cf50a7a58675216508b6b1ddc --- Rally/package/Classes/Rally.yaml | 61 ++++++ Rally/package/LICENSE | 175 ++++++++++++++++++ Rally/package/Resources/InstallRally.template | 32 ++++ .../package/Resources/scripts/installRally.sh | 19 ++ Rally/package/UI/ui.yaml | 103 +++++++++++ Rally/package/logo.png | Bin 0 -> 2911 bytes Rally/package/manifest.yaml | 25 +++ 7 files changed, 415 insertions(+) create mode 100644 Rally/package/Classes/Rally.yaml create mode 100644 Rally/package/LICENSE create mode 100644 Rally/package/Resources/InstallRally.template create mode 100644 Rally/package/Resources/scripts/installRally.sh create mode 100644 Rally/package/UI/ui.yaml create mode 100644 Rally/package/logo.png create mode 100644 Rally/package/manifest.yaml diff --git a/Rally/package/Classes/Rally.yaml b/Rally/package/Classes/Rally.yaml new file mode 100644 index 00000000..d09d05f8 --- /dev/null +++ b/Rally/package/Classes/Rally.yaml @@ -0,0 +1,61 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +Namespaces: + =: org.openstack + std: io.murano + res: io.murano.resources + sys: io.murano.system + + +Name: Rally + +Extends: std:Application + +Properties: + name: + Contract: $.string().notNull() + + instance: + Contract: $.class(res:LinuxMuranoInstance).notNull() + + repository: + Contract: $.string().notNull() + Default: https://git.openstack.org/openstack/rally + + version: + Contract: $.string().notNull() + Default: master + +Methods: + initialize: + Body: + - $._environment: $.find(std:Environment).require() + + deploy: + Body: + - If: not $.getAttr(deployed, false) + Then: + # Set deployed to true first to avoid race conditions + - $.setAttr(deployed, true) + - $._environment.reporter.report($this, 'Creating VM for Rally...') + - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress) + - $.instance.deploy() + - $resources: new(sys:Resources) + - $._environment.reporter.report($this, 'Instance has been created. Installing Rally...') + # Install Rally + - $template: $resources.yaml('InstallRally.template').bind(dict( + repository => $repository, + version => $version + )) + - $.instance.agent.call($template, $resources) + - $._environment.reporter.report($this, 'Rally has been installed.') diff --git a/Rally/package/LICENSE b/Rally/package/LICENSE new file mode 100644 index 00000000..67db8588 --- /dev/null +++ b/Rally/package/LICENSE @@ -0,0 +1,175 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. diff --git a/Rally/package/Resources/InstallRally.template b/Rally/package/Resources/InstallRally.template new file mode 100644 index 00000000..2219c88c --- /dev/null +++ b/Rally/package/Resources/InstallRally.template @@ -0,0 +1,32 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +FormatVersion: 2.0.0 +Version: 1.0.0 +Name: Install Rally + +Parameters: + repository: $repository + version: $version + +Body: | + return installRally('{0} {1}'.format(args.repository, args.version)).stdout + +Scripts: + installRally: + Type: Application + Version: 1.0.0 + EntryPoint: installRally.sh + Files: [] + Options: + captureStdout: true + captureStderr: true diff --git a/Rally/package/Resources/scripts/installRally.sh b/Rally/package/Resources/scripts/installRally.sh new file mode 100644 index 00000000..78479651 --- /dev/null +++ b/Rally/package/Resources/scripts/installRally.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +sudo apt-get update +sudo apt-get -y install git + +git clone $1 +git checkout $2 +./rally/install_rally.sh diff --git a/Rally/package/UI/ui.yaml b/Rally/package/UI/ui.yaml new file mode 100644 index 00000000..9d02cdb1 --- /dev/null +++ b/Rally/package/UI/ui.yaml @@ -0,0 +1,103 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +Version: 2 + +Application: + ?: + type: org.openstack.Rally + name: $.appConfiguration.name + instance: + ?: + type: io.murano.resources.LinuxMuranoInstance + name: generateHostname($.instanceConfiguration.unitNamingPattern, 1) + flavor: $.instanceConfiguration.flavor + image: $.instanceConfiguration.osImage + keyname: $.instanceConfiguration.keyPair + availabilityZone: $.instanceConfiguration.availabilityZone + assignFloatingIp: $.appConfiguration.assignFloatingIP + +Forms: + - appConfiguration: + fields: + - name: license + type: string + description: Apache License, Version 2.0 + hidden: true + required: false + - name: name + type: string + label: Application Name + initial: 'Rally' + description: >- + Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and + underline are allowed + - name: assignFloatingIP + type: boolean + label: Assign Floating IP + description: >- + Select to true to assign floating IP automatically + initial: false + required: false + widgetMedia: + css: {all: ['muranodashboard/css/checkbox.css']} + - name: dcInstances + type: integer + hidden: true + initial: 1 + + - instanceConfiguration: + fields: + - name: title + type: string + required: false + hidden: true + description: Specify some instance parameters on which the application would be created + - name: flavor + type: flavor + label: Instance flavor + description: >- + Select registered in Openstack flavor. Consider that application performance + depends on this parameter. + required: false + - name: osImage + type: image + imageType: linux + label: Instance image + description: >- + Select valid image for the application. Image should already be prepared and + registered in glance. + - name: keyPair + type: keypair + label: Key Pair + description: >- + Select the Key Pair to control access to instances. You can login to + instances using this KeyPair after the deployment of application. + required: false + - name: availabilityZone + type: azone + label: Availability zone + description: Select availability zone where application would be installed. + required: false + - name: unitNamingPattern + type: string + label: Instance Naming Pattern + required: false + maxLength: 64 + regexpValidator: '^[a-zA-z][-_\w]*$' + errorMessages: + invalid: Just letters, numbers, underscores and hyphens are allowed. + helpText: Just letters, numbers, underscores and hyphens are allowed. + description: >- + Specify a string, that will be used in instance hostname. + Just A-Z, a-z, 0-9, dash and underline are allowed. + diff --git a/Rally/package/logo.png b/Rally/package/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..19d9299d910f1d5a1a1755f48f7d70d3ccb735f9 GIT binary patch literal 2911 zcmd5;_dDBNACA#bvud=eXi-wMX-icHo?0zxlp>80YQ+i>F>96As@kh~j0X|5OGJ%m zwB#*flu{!>(HIqb)O^4F`TYl;b6w|remK{4#{IeP`}2u2F?z(yb%6^60`clS);0xV z=AX$42G$2G=pR5}$7t$3;{?V_PRCdfh+9NY`{A>IycL?&lV_G<;A#J8G&n|U7!u3D z&UI=<=bKw+&?Skb2z=?FuCm&B=_uKp@sZa#g?C0qF5TSez~RR6uF5znUMCV>jC8+( zj{?W9M_u~oY~eVUkUjXAyCX`?z5mAACa=<52y=%x>LIe$JUZ?U{imq7xR_1*s8@AB zypSA6mJ;9*iL{95}4Oy zhr{7{l)Ab)SiSQbq$Ecw0_@(Cc?|-AtTl&tcqo1y8d_(ztac!`sD^vLHyO2K9yxGr z?WhU6qm3RY(!;}7!ni;^#Dt><8Uy46XG;iMn`R*$@4Htb+9mq))dZJ>x1$l@ikj~3 z?&Oq|B2gct9lLg|rk2)Cw_(WVt}dy|msth}2Ww%9&7KMh3hOJxsr{yyxo#)}R*f^v zjh>veHl(76#f62S7XMXUEv?9(c~oaD3k#7-iwbCq9*zC8xPe!n)2+9)-ZPrNrrHr7 zf(Z=`(@7e~Yv#L;AN@61cYLs_L1esm@uJpu(KPQtps88d)G_6 zhP)TV#0JO5<589?Ynh%SfyZ8DpjJteWP1JpGq5=X$#)j9Li@2m~xw5!3g_>Ro7|xP}Iylf%swRm`AbCcG1a#e*hL@gc*@Ai%CFSew!OP6p%MDv$Ly@m!9rCyrwHif;X38Ug*Qkq zFG{^j|JvFNAO&B@O0Tn$iWj{ym^YFfZqwp-Sw&@Jh1DI2gjiI;OHYe{hQED_Ih-K$9US=*$KIN^`W_W1`5vuW^44C zVy+`RO-)lLOt5jWu_kV$?2l~wpJo7n2kG?c@(=VX(1|EG0>ouu47|ec*Y}7k2APM5 zQMBqsPJVvNC0dNVo}la#laa!u^(lXy7hGQC|LQUcntN2_A4{|Ni&1@Y5rM#g7ID2EyG(t7jGli*qmlQJTU|NS0)I zMMZ5C>bksw08}WaHF;n5!C-D55U<;|#zIMZtYk77a{anRe)^FsfDaOq z5Fg*s`&Mavv8>?7n>%!qKE~YKmMZ`LZ$?2KdR8~7$cK{UUpYN(r)b*>Gjm6wy5@Vb zSn!(__Mf8dyVI|#FBjZlm4(>=xB?Q$I31v+#YX!5Q;b;9f?*`S*Xj^&Ye|Ey!onH1 zuZ`N3mXshfpBz5?c#3<$y5>u7@3SR2<9uy2x{m3RD1INugZ>o5{|N94zKg2ifUKvx zGZdQ8vtZK6aq#>miEpGtFD*Gaxv(4{1aH{Uc9suin`nQAbHI+}xD@@tiimPeJaQ$pwS+%MdCMs&31(fl(FDj^?@XLnpU*=4h>;BSM(G4@ zf3pOH$m=2oygMO*r_#3VfCRrER#sx9{UrrP9le^X5YvA0z0TpOnOSk30bndN|DXJw*xOHQX>)g&f-mU&Aa z3RWg3pYfnIo0p&LOnB{Wk0MxnjiPr~CSvmPE;8t4fEmK7EM%@+v8Od-fvUT=P@Hrl zXbVZjTE{#s#MB(sIZ%=_Gozmt>ynYmQZh2^08t(r8&d$9{2fsXuTu4%2HjFp5)c$* zOZ&q9y7Se-0vEAl6K`k#eGjXT@gTs1^Xhq(!9D$dDhnCjfJ~WE=k+_iHy=%2*jgNF z3Rsttl9o=%$|`G}wQliS0d4mN^JGfOU%S?spb!|Hdt9s`cy431mhLaDd$}qcitJ;-*a=|C`&qJxRA@ZG9)d Sq#&SU2I=V-X;*97z4{-Bu#U$7 literal 0 HcmV?d00001 diff --git a/Rally/package/manifest.yaml b/Rally/package/manifest.yaml new file mode 100644 index 00000000..581d4527 --- /dev/null +++ b/Rally/package/manifest.yaml @@ -0,0 +1,25 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +Format: 1.0 +Type: Application +FullName: org.openstack.Rally +Name: Rally +Description: | + Rally is an official OpenStack benchmarking and performance analysis tool. + Rally is intended to provide the community with a benchmarking tool + that is capable of performing specific, complicated and reproducible + test cases on real deployment scenarios. +Author: 'Mirantis, Inc' +Tags: [Rally, Benchmark, Performance, Testing, QA] +Classes: + org.openstack.Rally: Rally.yaml