diff --git a/.gitignore b/.gitignore index b7a56aed..e50431d2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,26 @@ build/ # ReSharper is a .NET coding add-in _ReSharper*/ *.[Rr]e[Ss]harper + + +#IntelJ Idea +.idea/ + +#virtualenv +.venv/ + +#Build results +build/ +dist/ +*.egg-info/ +*.egg +.tox +AUTHORS +ChangeLog + +#Python +*.pyc + +#Translation build +*.mo + diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 00000000..6cdcaa0c --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,47 @@ +====================== +Contributing to Murano +====================== + +If you're interested in contributing to the Murano project, +the following will help get you started. + +Contributor License Agreement +============================= + +In order to contribute to the Murano project, you need to have +signed OpenStack's contributor's agreement: + +* http://wiki.openstack.org/HowToContribute +* http://wiki.openstack.org/CLA + + +Project Hosting Details +======================= + +* Bug tracker + https://launchpad.net/murano + +* Mailing list (prefix subjects with ``[Murano]`` for faster responses) + http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev + +* Wiki + https://wiki.openstack.org/wiki/Murano + +* IRC channel + * #murano at FreeNode + + * https://wiki.openstack.org/wiki/Meetings#Murano_meeting + +* Code Hosting + * https://git.openstack.org/cgit/stackforge/murano + + * https://git.openstack.org/cgit/stackforge/murano-agent + + * https://git.openstack.org/cgit/stackforge/murano-dashboard + + * https://git.openstack.org/cgit/stackforge/python-muranoclient + +* Code Review + * https://review.openstack.org/#/q/murano+AND+status:+open,n,z + + * https://wiki.openstack.org/wiki/GerritWorkflow diff --git a/HACKING.rst b/HACKING.rst new file mode 100644 index 00000000..cb074765 --- /dev/null +++ b/HACKING.rst @@ -0,0 +1,4 @@ +Style Commandments +================== + +Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..68c771a0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,176 @@ + + 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/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..ddb06488 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,10 @@ +include AUTHORS +include README.rst +include ChangeLog +include LICENSE + +exclude .gitignore +exclude .gitreview + +global-exclude *.pyc +exclude contrib/* diff --git a/README.rst b/README.rst index d353bdc5..6ef1e830 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ developers and cloud administrators to publish various cloud-ready applications in a browsable‎ categorised catalog, which may be used by the cloud users (including the inexperienced ones) to pick-up the needed applications and services and composes the reliable environments out of them -in a “push-the-button” manner. +in a "push-the-button" manner. murano-agent ============ @@ -17,24 +17,20 @@ described in `Unified Agent `__ -* `Wiki `__ -* `Code Review `__ -* `Sources `__ -* `Developers Guide `__ -How To Participate ------------------- -If you would like to ask some questions or make proposals, feel free to reach -us on #murano IRC channel at FreeNode. Typically somebody from our team will -be online at IRC from 6:00 to 20:00 UTC. You can also contact Murano community -directly by openstack-dev@lists.openstack.org adding [Murano] to a subject. +Project status, bugs, and blueprints are tracked on Launchpad: -We’re holding public weekly meetings on Tuesdays at 17:00 UTC -on #openstack-meeting-alt IRC channel at FreeNode. + https://launchpad.net/murano -If you want to contribute either to docs or to code, simply send us change -request via `gerrit `__. -You can `file bugs `__ and -`register blueprints `__ on -Launchpad. +Developer documentation can be found here: + + https://murano.readthedocs.org + +Additional resources are linked from the project wiki page: + + https://wiki.openstack.org/wiki/Murano + +License +------- + +Apache License Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 diff --git a/c-demo-agent/Makefile b/contrib/c-demo-agent/Makefile similarity index 100% rename from c-demo-agent/Makefile rename to contrib/c-demo-agent/Makefile diff --git a/c-demo-agent/Readme b/contrib/c-demo-agent/Readme similarity index 100% rename from c-demo-agent/Readme rename to contrib/c-demo-agent/Readme diff --git a/c-demo-agent/amqp.h b/contrib/c-demo-agent/amqp.h similarity index 100% rename from c-demo-agent/amqp.h rename to contrib/c-demo-agent/amqp.h diff --git a/c-demo-agent/amqp_framing.h b/contrib/c-demo-agent/amqp_framing.h similarity index 100% rename from c-demo-agent/amqp_framing.h rename to contrib/c-demo-agent/amqp_framing.h diff --git a/c-demo-agent/amqp_ssl_socket.h b/contrib/c-demo-agent/amqp_ssl_socket.h similarity index 100% rename from c-demo-agent/amqp_ssl_socket.h rename to contrib/c-demo-agent/amqp_ssl_socket.h diff --git a/c-demo-agent/amqp_tcp_socket.h b/contrib/c-demo-agent/amqp_tcp_socket.h similarity index 100% rename from c-demo-agent/amqp_tcp_socket.h rename to contrib/c-demo-agent/amqp_tcp_socket.h diff --git a/c-demo-agent/lcfg_static.c b/contrib/c-demo-agent/lcfg_static.c similarity index 100% rename from c-demo-agent/lcfg_static.c rename to contrib/c-demo-agent/lcfg_static.c diff --git a/c-demo-agent/lcfg_static.h b/contrib/c-demo-agent/lcfg_static.h similarity index 100% rename from c-demo-agent/lcfg_static.h rename to contrib/c-demo-agent/lcfg_static.h diff --git a/c-demo-agent/librabbitmq.a b/contrib/c-demo-agent/librabbitmq.a similarity index 100% rename from c-demo-agent/librabbitmq.a rename to contrib/c-demo-agent/librabbitmq.a diff --git a/c-demo-agent/murano-agent.c b/contrib/c-demo-agent/murano-agent.c similarity index 100% rename from c-demo-agent/murano-agent.c rename to contrib/c-demo-agent/murano-agent.c diff --git a/c-demo-agent/murano-agent.conf.example b/contrib/c-demo-agent/murano-agent.conf.example similarity index 100% rename from c-demo-agent/murano-agent.conf.example rename to contrib/c-demo-agent/murano-agent.conf.example diff --git a/c-demo-agent/producer.c b/contrib/c-demo-agent/producer.c similarity index 100% rename from c-demo-agent/producer.c rename to contrib/c-demo-agent/producer.c diff --git a/c-demo-agent/utils.c b/contrib/c-demo-agent/utils.c similarity index 100% rename from c-demo-agent/utils.c rename to contrib/c-demo-agent/utils.c diff --git a/c-demo-agent/utils.h b/contrib/c-demo-agent/utils.h similarity index 100% rename from c-demo-agent/utils.h rename to contrib/c-demo-agent/utils.h diff --git a/windows-agent/ExecutionPlanGenerator/App.config b/contrib/windows-agent/ExecutionPlanGenerator/App.config similarity index 100% rename from windows-agent/ExecutionPlanGenerator/App.config rename to contrib/windows-agent/ExecutionPlanGenerator/App.config diff --git a/windows-agent/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj b/contrib/windows-agent/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj similarity index 100% rename from windows-agent/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj rename to contrib/windows-agent/ExecutionPlanGenerator/ExecutionPlanGenerator.csproj diff --git a/windows-agent/ExecutionPlanGenerator/Program.cs b/contrib/windows-agent/ExecutionPlanGenerator/Program.cs similarity index 100% rename from windows-agent/ExecutionPlanGenerator/Program.cs rename to contrib/windows-agent/ExecutionPlanGenerator/Program.cs diff --git a/windows-agent/ExecutionPlanGenerator/Properties/AssemblyInfo.cs b/contrib/windows-agent/ExecutionPlanGenerator/Properties/AssemblyInfo.cs similarity index 100% rename from windows-agent/ExecutionPlanGenerator/Properties/AssemblyInfo.cs rename to contrib/windows-agent/ExecutionPlanGenerator/Properties/AssemblyInfo.cs diff --git a/windows-agent/ExecutionPlanGenerator/packages.config b/contrib/windows-agent/ExecutionPlanGenerator/packages.config similarity index 100% rename from windows-agent/ExecutionPlanGenerator/packages.config rename to contrib/windows-agent/ExecutionPlanGenerator/packages.config diff --git a/windows-agent/Tools/NuGet.exe b/contrib/windows-agent/Tools/NuGet.exe similarity index 100% rename from windows-agent/Tools/NuGet.exe rename to contrib/windows-agent/Tools/NuGet.exe diff --git a/windows-agent/WindowsAgent.sln b/contrib/windows-agent/WindowsAgent.sln similarity index 100% rename from windows-agent/WindowsAgent.sln rename to contrib/windows-agent/WindowsAgent.sln diff --git a/windows-agent/WindowsAgent/App.config b/contrib/windows-agent/WindowsAgent/App.config similarity index 100% rename from windows-agent/WindowsAgent/App.config rename to contrib/windows-agent/WindowsAgent/App.config diff --git a/windows-agent/WindowsAgent/ExecutionPlan.cs b/contrib/windows-agent/WindowsAgent/ExecutionPlan.cs similarity index 100% rename from windows-agent/WindowsAgent/ExecutionPlan.cs rename to contrib/windows-agent/WindowsAgent/ExecutionPlan.cs diff --git a/windows-agent/WindowsAgent/MqMessage.cs b/contrib/windows-agent/WindowsAgent/MqMessage.cs similarity index 100% rename from windows-agent/WindowsAgent/MqMessage.cs rename to contrib/windows-agent/WindowsAgent/MqMessage.cs diff --git a/windows-agent/WindowsAgent/PlanExecutor.cs b/contrib/windows-agent/WindowsAgent/PlanExecutor.cs similarity index 100% rename from windows-agent/WindowsAgent/PlanExecutor.cs rename to contrib/windows-agent/WindowsAgent/PlanExecutor.cs diff --git a/windows-agent/WindowsAgent/Program.cs b/contrib/windows-agent/WindowsAgent/Program.cs similarity index 100% rename from windows-agent/WindowsAgent/Program.cs rename to contrib/windows-agent/WindowsAgent/Program.cs diff --git a/windows-agent/WindowsAgent/Properties/AssemblyInfo.cs b/contrib/windows-agent/WindowsAgent/Properties/AssemblyInfo.cs similarity index 100% rename from windows-agent/WindowsAgent/Properties/AssemblyInfo.cs rename to contrib/windows-agent/WindowsAgent/Properties/AssemblyInfo.cs diff --git a/windows-agent/WindowsAgent/RabbitMqClient.cs b/contrib/windows-agent/WindowsAgent/RabbitMqClient.cs similarity index 100% rename from windows-agent/WindowsAgent/RabbitMqClient.cs rename to contrib/windows-agent/WindowsAgent/RabbitMqClient.cs diff --git a/windows-agent/WindowsAgent/SampleExecutionPlan.json b/contrib/windows-agent/WindowsAgent/SampleExecutionPlan.json similarity index 100% rename from windows-agent/WindowsAgent/SampleExecutionPlan.json rename to contrib/windows-agent/WindowsAgent/SampleExecutionPlan.json diff --git a/windows-agent/WindowsAgent/ServiceManager.cs b/contrib/windows-agent/WindowsAgent/ServiceManager.cs similarity index 100% rename from windows-agent/WindowsAgent/ServiceManager.cs rename to contrib/windows-agent/WindowsAgent/ServiceManager.cs diff --git a/windows-agent/WindowsAgent/WindowsAgent.csproj b/contrib/windows-agent/WindowsAgent/WindowsAgent.csproj similarity index 100% rename from windows-agent/WindowsAgent/WindowsAgent.csproj rename to contrib/windows-agent/WindowsAgent/WindowsAgent.csproj diff --git a/windows-agent/WindowsAgent/WindowsService.cs b/contrib/windows-agent/WindowsAgent/WindowsService.cs similarity index 100% rename from windows-agent/WindowsAgent/WindowsService.cs rename to contrib/windows-agent/WindowsAgent/WindowsService.cs diff --git a/windows-agent/WindowsAgent/WindowsServiceInstaller.cs b/contrib/windows-agent/WindowsAgent/WindowsServiceInstaller.cs similarity index 100% rename from windows-agent/WindowsAgent/WindowsServiceInstaller.cs rename to contrib/windows-agent/WindowsAgent/WindowsServiceInstaller.cs diff --git a/windows-agent/WindowsAgent/packages.config b/contrib/windows-agent/WindowsAgent/packages.config similarity index 100% rename from windows-agent/WindowsAgent/packages.config rename to contrib/windows-agent/WindowsAgent/packages.config diff --git a/windows-agent/packages/repositories.config b/contrib/windows-agent/packages/repositories.config similarity index 100% rename from windows-agent/packages/repositories.config rename to contrib/windows-agent/packages/repositories.config diff --git a/python-agent/etc/agent.conf b/etc/agent.conf similarity index 100% rename from python-agent/etc/agent.conf rename to etc/agent.conf diff --git a/python-agent/init.d/murano-agent-deb b/init.d/murano-agent-deb similarity index 100% rename from python-agent/init.d/murano-agent-deb rename to init.d/murano-agent-deb diff --git a/python-agent/init.d/murano-agent-el6 b/init.d/murano-agent-el6 similarity index 100% rename from python-agent/init.d/murano-agent-el6 rename to init.d/murano-agent-el6 diff --git a/python-agent/muranoagent/__init__.py b/muranoagent/__init__.py similarity index 100% rename from python-agent/muranoagent/__init__.py rename to muranoagent/__init__.py diff --git a/python-agent/muranoagent/app.py b/muranoagent/app.py similarity index 100% rename from python-agent/muranoagent/app.py rename to muranoagent/app.py diff --git a/python-agent/muranoagent/cmd/__init__.py b/muranoagent/cmd/__init__.py similarity index 100% rename from python-agent/muranoagent/cmd/__init__.py rename to muranoagent/cmd/__init__.py diff --git a/python-agent/muranoagent/cmd/run.py b/muranoagent/cmd/run.py similarity index 100% rename from python-agent/muranoagent/cmd/run.py rename to muranoagent/cmd/run.py diff --git a/python-agent/muranoagent/common/__init__.py b/muranoagent/common/__init__.py similarity index 100% rename from python-agent/muranoagent/common/__init__.py rename to muranoagent/common/__init__.py diff --git a/python-agent/muranoagent/common/messaging/__init__.py b/muranoagent/common/messaging/__init__.py similarity index 100% rename from python-agent/muranoagent/common/messaging/__init__.py rename to muranoagent/common/messaging/__init__.py diff --git a/python-agent/muranoagent/common/messaging/message.py b/muranoagent/common/messaging/message.py similarity index 100% rename from python-agent/muranoagent/common/messaging/message.py rename to muranoagent/common/messaging/message.py diff --git a/python-agent/muranoagent/common/messaging/mqclient.py b/muranoagent/common/messaging/mqclient.py similarity index 100% rename from python-agent/muranoagent/common/messaging/mqclient.py rename to muranoagent/common/messaging/mqclient.py diff --git a/python-agent/muranoagent/common/messaging/subscription.py b/muranoagent/common/messaging/subscription.py similarity index 100% rename from python-agent/muranoagent/common/messaging/subscription.py rename to muranoagent/common/messaging/subscription.py diff --git a/python-agent/muranoagent/config.py b/muranoagent/config.py similarity index 100% rename from python-agent/muranoagent/config.py rename to muranoagent/config.py diff --git a/python-agent/muranoagent/exceptions.py b/muranoagent/exceptions.py similarity index 100% rename from python-agent/muranoagent/exceptions.py rename to muranoagent/exceptions.py diff --git a/python-agent/muranoagent/execution_plan_queue.py b/muranoagent/execution_plan_queue.py similarity index 100% rename from python-agent/muranoagent/execution_plan_queue.py rename to muranoagent/execution_plan_queue.py diff --git a/python-agent/muranoagent/execution_plan_runner.py b/muranoagent/execution_plan_runner.py similarity index 100% rename from python-agent/muranoagent/execution_plan_runner.py rename to muranoagent/execution_plan_runner.py diff --git a/python-agent/muranoagent/execution_result.py b/muranoagent/execution_result.py similarity index 100% rename from python-agent/muranoagent/execution_result.py rename to muranoagent/execution_result.py diff --git a/python-agent/muranoagent/executors/__init__.py b/muranoagent/executors/__init__.py similarity index 100% rename from python-agent/muranoagent/executors/__init__.py rename to muranoagent/executors/__init__.py diff --git a/python-agent/muranoagent/executors/application/__init__.py b/muranoagent/executors/application/__init__.py similarity index 100% rename from python-agent/muranoagent/executors/application/__init__.py rename to muranoagent/executors/application/__init__.py diff --git a/python-agent/muranoagent/files_manager.py b/muranoagent/files_manager.py similarity index 100% rename from python-agent/muranoagent/files_manager.py rename to muranoagent/files_manager.py diff --git a/python-agent/muranoagent/openstack/__init__.py b/muranoagent/openstack/__init__.py similarity index 100% rename from python-agent/muranoagent/openstack/__init__.py rename to muranoagent/openstack/__init__.py diff --git a/python-agent/muranoagent/openstack/common/__init__.py b/muranoagent/openstack/common/__init__.py similarity index 100% rename from python-agent/muranoagent/openstack/common/__init__.py rename to muranoagent/openstack/common/__init__.py diff --git a/python-agent/muranoagent/openstack/common/config/__init__.py b/muranoagent/openstack/common/config/__init__.py similarity index 100% rename from python-agent/muranoagent/openstack/common/config/__init__.py rename to muranoagent/openstack/common/config/__init__.py diff --git a/python-agent/muranoagent/openstack/common/config/generator.py b/muranoagent/openstack/common/config/generator.py similarity index 100% rename from python-agent/muranoagent/openstack/common/config/generator.py rename to muranoagent/openstack/common/config/generator.py diff --git a/python-agent/muranoagent/openstack/common/eventlet_backdoor.py b/muranoagent/openstack/common/eventlet_backdoor.py similarity index 100% rename from python-agent/muranoagent/openstack/common/eventlet_backdoor.py rename to muranoagent/openstack/common/eventlet_backdoor.py diff --git a/python-agent/muranoagent/openstack/common/gettextutils.py b/muranoagent/openstack/common/gettextutils.py similarity index 100% rename from python-agent/muranoagent/openstack/common/gettextutils.py rename to muranoagent/openstack/common/gettextutils.py diff --git a/python-agent/muranoagent/openstack/common/importutils.py b/muranoagent/openstack/common/importutils.py similarity index 100% rename from python-agent/muranoagent/openstack/common/importutils.py rename to muranoagent/openstack/common/importutils.py diff --git a/python-agent/muranoagent/openstack/common/jsonutils.py b/muranoagent/openstack/common/jsonutils.py similarity index 100% rename from python-agent/muranoagent/openstack/common/jsonutils.py rename to muranoagent/openstack/common/jsonutils.py diff --git a/python-agent/muranoagent/openstack/common/local.py b/muranoagent/openstack/common/local.py similarity index 100% rename from python-agent/muranoagent/openstack/common/local.py rename to muranoagent/openstack/common/local.py diff --git a/python-agent/muranoagent/openstack/common/log.py b/muranoagent/openstack/common/log.py similarity index 100% rename from python-agent/muranoagent/openstack/common/log.py rename to muranoagent/openstack/common/log.py diff --git a/python-agent/muranoagent/openstack/common/loopingcall.py b/muranoagent/openstack/common/loopingcall.py similarity index 100% rename from python-agent/muranoagent/openstack/common/loopingcall.py rename to muranoagent/openstack/common/loopingcall.py diff --git a/python-agent/muranoagent/openstack/common/service.py b/muranoagent/openstack/common/service.py similarity index 100% rename from python-agent/muranoagent/openstack/common/service.py rename to muranoagent/openstack/common/service.py diff --git a/python-agent/muranoagent/openstack/common/threadgroup.py b/muranoagent/openstack/common/threadgroup.py similarity index 100% rename from python-agent/muranoagent/openstack/common/threadgroup.py rename to muranoagent/openstack/common/threadgroup.py diff --git a/python-agent/muranoagent/openstack/common/timeutils.py b/muranoagent/openstack/common/timeutils.py similarity index 100% rename from python-agent/muranoagent/openstack/common/timeutils.py rename to muranoagent/openstack/common/timeutils.py diff --git a/python-agent/muranoagent/script_runner.py b/muranoagent/script_runner.py similarity index 100% rename from python-agent/muranoagent/script_runner.py rename to muranoagent/script_runner.py diff --git a/python-agent/muranoagent/tests/__init__.py b/muranoagent/tests/__init__.py similarity index 100% rename from python-agent/muranoagent/tests/__init__.py rename to muranoagent/tests/__init__.py diff --git a/python-agent/muranoagent/win32.py b/muranoagent/win32.py similarity index 100% rename from python-agent/muranoagent/win32.py rename to muranoagent/win32.py diff --git a/python-agent/openstack-common.conf b/openstack-common.conf similarity index 100% rename from python-agent/openstack-common.conf rename to openstack-common.conf diff --git a/python-agent/MANIFEST.in b/python-agent/MANIFEST.in deleted file mode 100644 index 3dcf1334..00000000 --- a/python-agent/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include requirements.txt -prune windows-agent -prune python-agent \ No newline at end of file diff --git a/python-agent/README.rst b/python-agent/README.rst deleted file mode 100644 index f1b8b747..00000000 --- a/python-agent/README.rst +++ /dev/null @@ -1,10 +0,0 @@ -Murano Python Agent README -========================== -Murano Python Agent is a VM-side guest agent that accepts commands from -Murano Conductor and executes them. Python Agent works on Linux and -uses new execution plan format described in `Unified Agent blueprint -`_ - -SEE ALSO --------- -* `Murano `__ diff --git a/python-agent/tox.ini b/python-agent/tox.ini deleted file mode 100644 index 15d56f87..00000000 --- a/python-agent/tox.ini +++ /dev/null @@ -1,58 +0,0 @@ -[tox] -envlist = py26,py27,pep8,pyflakes - -[testenv] -setenv = VIRTUAL_ENV={envdir} - NOSE_WITH_OPENSTACK=1 - NOSE_OPENSTACK_COLOR=1 - NOSE_OPENSTACK_RED=0.05 - NOSE_OPENSTACK_YELLOW=0.025 - NOSE_OPENSTACK_SHOW_ELAPSED=1 -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt -commands = nosetests - -[testenv:pep8] -deps = pep8==1.3.3 -commands = pep8 --repeat --show-source muranoagent setup.py - -[testenv:venv] -commands = {posargs} - -[testenv:cover] -commands = nosetests --cover-erase --cover-package=muranoagent --with-xcoverage - -[tox:jenkins] -downloadcache = ~/cache/pip - -[testenv:jenkins26] -basepython = python2.6 -setenv = NOSE_WITH_XUNIT=1 -deps = file://{toxinidir}/.cache.bundle - -[testenv:jenkins27] -basepython = python2.7 -setenv = NOSE_WITH_XUNIT=1 -deps = file://{toxinidir}/.cache.bundle - -[testenv:jenkinscover] -deps = file://{toxinidir}/.cache.bundle -setenv = NOSE_WITH_XUNIT=1 -commands = nosetests --cover-erase --cover-package=muranoagent --with-xcoverage - -[testenv:jenkinsvenv] -deps = file://{toxinidir}/.cache.bundle -setenv = NOSE_WITH_XUNIT=1 -commands = {posargs} - -[testenv:pyflakes] -deps = flake8 -commands = flake8 - -[flake8] -# H301 one import per line -# H302 import only modules -ignore = H301,H302,F401 -show-source = true -builtins = _ -exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools \ No newline at end of file diff --git a/python-agent/requirements.txt b/requirements.txt similarity index 100% rename from python-agent/requirements.txt rename to requirements.txt diff --git a/python-agent/setup-centos.sh b/setup-centos.sh similarity index 100% rename from python-agent/setup-centos.sh rename to setup-centos.sh diff --git a/python-agent/setup.cfg b/setup.cfg similarity index 100% rename from python-agent/setup.cfg rename to setup.cfg diff --git a/python-agent/setup.py b/setup.py similarity index 100% rename from python-agent/setup.py rename to setup.py diff --git a/python-agent/setup.sh b/setup.sh similarity index 100% rename from python-agent/setup.sh rename to setup.sh diff --git a/python-agent/test-requirements.txt b/test-requirements.txt similarity index 88% rename from python-agent/test-requirements.txt rename to test-requirements.txt index bcf01ad8..9885f518 100644 --- a/python-agent/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,5 @@ -# Needed for testing +hacking>=0.8.0,<0.9 + unittest2 coverage>=3.6 fixtures>=0.3.14 @@ -7,7 +8,6 @@ nose nose-exclude openstack.nose_plugin>=0.7 nosehtmloutput>=0.0.3 -pep8==1.3.3 sphinx>=1.1.2 requests>=1.1 testtools>=0.9.32 diff --git a/python-agent/tools/config/generate_sample.sh b/tools/config/generate_sample.sh similarity index 100% rename from python-agent/tools/config/generate_sample.sh rename to tools/config/generate_sample.sh diff --git a/python-agent/tools/install_venv_common.py b/tools/install_venv_common.py similarity index 100% rename from python-agent/tools/install_venv_common.py rename to tools/install_venv_common.py diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..bf165ac4 --- /dev/null +++ b/tox.ini @@ -0,0 +1,37 @@ +[tox] +envlist = py26,py27,pep8 +minversion = 1.6 +skipsdist = True + +[testenv] +setenv = VIRTUAL_ENV={envdir} + NOSE_WITH_OPENSTACK=1 + NOSE_OPENSTACK_COLOR=1 + NOSE_OPENSTACK_RED=0.05 + NOSE_OPENSTACK_YELLOW=0.025 + NOSE_OPENSTACK_SHOW_ELAPSED=1 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt +commands = nosetests + +[testenv:pep8] +commands = + flake8 {posargs} + +[testenv:venv] +commands = {posargs} + +[testenv:cover] +commands = nosetests --cover-erase --cover-package=muranoagent --with-xcoverage + +[testenv:pyflakes] +deps = flake8 +commands = flake8 + +[flake8] +# H301 one import per line +# H302 import only modules +ignore = H231,H233,H301,H302,H306,H404,F401 +show-source = true +builtins = _ +exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools