Merge lp:~canonical-ci-engineering/adt-request-proxy/trunk-initial-development into lp:adt-request-proxy

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 4
Merged at revision: 3
Proposed branch: lp:~canonical-ci-engineering/adt-request-proxy/trunk-initial-development
Merge into: lp:adt-request-proxy
Diff against target: 1298 lines (+1105/-104)
15 files modified
.adt-service.conf (+3/-0)
.bzrignore (+2/-0)
COPYING (+674/-0)
README.md (+0/-26)
README.rst (+43/-0)
adt-request-proxy.py (+17/-78)
adt_request_proxy/__init__.py (+69/-0)
adt_request_proxy/errors.py (+35/-0)
adt_request_proxy/queue.py (+80/-0)
adt_request_proxy/tests/__init__.py (+18/-0)
adt_request_proxy/tests/test_functional.py (+62/-0)
adt_request_proxy/v1.py (+57/-0)
requirements.txt (+2/-0)
setup.py (+42/-0)
test_requirements.txt (+1/-0)
To merge this branch: bzr merge lp:~canonical-ci-engineering/adt-request-proxy/trunk-initial-development
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
Paul Larson Approve
Review via email: mp+252239@code.launchpad.net

Commit message

Initial development effort. Can post tests, no result checking yet.

Description of the change

This branch gets the majority of the development work on adt-request-proxy out of the way. With this branch, we can:

* Spin up a flask webapp that responds to:
 - POST on /v1/test
 - GET on /v1/test/<request-id>
* Webapp actually posts requests to the correct amqp queue (this works with adt-cloud-worker)
* Run functional tests over the web app.

STILL TODO:

* Figure out how we're going to host this in production (gunicorn? mod_wsgi?), and do something better than the flask dev server.
* Add code that checks swift for the final result tarball - this will live in adt_request_proxy.swift eventually
* Fix up the kombu code. At the moment it's a pretty shoddy copy/paste from celco's prototype.

To post a comment you must log in.
Revision history for this message
Evan (ev) wrote :

On 9 March 2015 at 03:37, Thomi Richards <email address hidden> wrote:
> * Figure out how we're going to host this in production (gunicorn? mod_wsgi?), and do something better than the flask dev server.

gunicorn is what we've been using in the past. I don't know of any
deployments that are still on mod_wsgi.

Revision history for this message
Paul Larson (pwlars) wrote :

Small comment about the API versioning that you'll need for this to work at all, and it's simple enough that you may as well go ahead and do it here. Otherwise, I think this MP is a good start, but already getting big. I'm very much in favor of landing it asap even if there are still TODO items documented. Those can then be easily handled by anyone, and we don't end up with a huge mp to sort though and block other progress until it's perfect. Just make sure they are referenced in comments, and in tasks.

review: Approve
4. By Thomi Richards

Feedback from code review.

Revision history for this message
Celso Providelo (cprov) wrote :

Thomi,

Let's land this and unblock possible tweaks for integrating with https://jujucharms.com/u/webteam-backend/wsgi-app charm and the mojo spec.

I also suspect there a disconnection between the project name and the production environment we created (adt-request-proxy vs. adt-cloud-service, it's entirely my fault. If it emerge weirdly in the mojo spec work, I think we should renamed it sooner than later. Let's wait and see.

Thank you.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.adt-service.conf'
2--- .adt-service.conf 2015-03-02 22:47:39 +0000
3+++ .adt-service.conf 2015-03-10 20:41:45 +0000
4@@ -6,6 +6,9 @@
5 [amqp]
6 uris = amqp://guest:guest@localhost:5672//
7
8+[swift]
9+public_url = http://some.swift.server.com
10+
11 [nova]
12 os_username = foo
13 os_tenant_name = foo_project
14
15=== added file '.bzrignore'
16--- .bzrignore 1970-01-01 00:00:00 +0000
17+++ .bzrignore 2015-03-10 20:41:45 +0000
18@@ -0,0 +1,2 @@
19+ve
20+adt_request_proxy.egg-info
21
22=== added file 'COPYING'
23--- COPYING 1970-01-01 00:00:00 +0000
24+++ COPYING 2015-03-10 20:41:45 +0000
25@@ -0,0 +1,674 @@
26+ GNU GENERAL PUBLIC LICENSE
27+ Version 3, 29 June 2007
28+
29+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
30+ Everyone is permitted to copy and distribute verbatim copies
31+ of this license document, but changing it is not allowed.
32+
33+ Preamble
34+
35+ The GNU General Public License is a free, copyleft license for
36+software and other kinds of works.
37+
38+ The licenses for most software and other practical works are designed
39+to take away your freedom to share and change the works. By contrast,
40+the GNU General Public License is intended to guarantee your freedom to
41+share and change all versions of a program--to make sure it remains free
42+software for all its users. We, the Free Software Foundation, use the
43+GNU General Public License for most of our software; it applies also to
44+any other work released this way by its authors. You can apply it to
45+your programs, too.
46+
47+ When we speak of free software, we are referring to freedom, not
48+price. Our General Public Licenses are designed to make sure that you
49+have the freedom to distribute copies of free software (and charge for
50+them if you wish), that you receive source code or can get it if you
51+want it, that you can change the software or use pieces of it in new
52+free programs, and that you know you can do these things.
53+
54+ To protect your rights, we need to prevent others from denying you
55+these rights or asking you to surrender the rights. Therefore, you have
56+certain responsibilities if you distribute copies of the software, or if
57+you modify it: responsibilities to respect the freedom of others.
58+
59+ For example, if you distribute copies of such a program, whether
60+gratis or for a fee, you must pass on to the recipients the same
61+freedoms that you received. You must make sure that they, too, receive
62+or can get the source code. And you must show them these terms so they
63+know their rights.
64+
65+ Developers that use the GNU GPL protect your rights with two steps:
66+(1) assert copyright on the software, and (2) offer you this License
67+giving you legal permission to copy, distribute and/or modify it.
68+
69+ For the developers' and authors' protection, the GPL clearly explains
70+that there is no warranty for this free software. For both users' and
71+authors' sake, the GPL requires that modified versions be marked as
72+changed, so that their problems will not be attributed erroneously to
73+authors of previous versions.
74+
75+ Some devices are designed to deny users access to install or run
76+modified versions of the software inside them, although the manufacturer
77+can do so. This is fundamentally incompatible with the aim of
78+protecting users' freedom to change the software. The systematic
79+pattern of such abuse occurs in the area of products for individuals to
80+use, which is precisely where it is most unacceptable. Therefore, we
81+have designed this version of the GPL to prohibit the practice for those
82+products. If such problems arise substantially in other domains, we
83+stand ready to extend this provision to those domains in future versions
84+of the GPL, as needed to protect the freedom of users.
85+
86+ Finally, every program is threatened constantly by software patents.
87+States should not allow patents to restrict development and use of
88+software on general-purpose computers, but in those that do, we wish to
89+avoid the special danger that patents applied to a free program could
90+make it effectively proprietary. To prevent this, the GPL assures that
91+patents cannot be used to render the program non-free.
92+
93+ The precise terms and conditions for copying, distribution and
94+modification follow.
95+
96+ TERMS AND CONDITIONS
97+
98+ 0. Definitions.
99+
100+ "This License" refers to version 3 of the GNU General Public License.
101+
102+ "Copyright" also means copyright-like laws that apply to other kinds of
103+works, such as semiconductor masks.
104+
105+ "The Program" refers to any copyrightable work licensed under this
106+License. Each licensee is addressed as "you". "Licensees" and
107+"recipients" may be individuals or organizations.
108+
109+ To "modify" a work means to copy from or adapt all or part of the work
110+in a fashion requiring copyright permission, other than the making of an
111+exact copy. The resulting work is called a "modified version" of the
112+earlier work or a work "based on" the earlier work.
113+
114+ A "covered work" means either the unmodified Program or a work based
115+on the Program.
116+
117+ To "propagate" a work means to do anything with it that, without
118+permission, would make you directly or secondarily liable for
119+infringement under applicable copyright law, except executing it on a
120+computer or modifying a private copy. Propagation includes copying,
121+distribution (with or without modification), making available to the
122+public, and in some countries other activities as well.
123+
124+ To "convey" a work means any kind of propagation that enables other
125+parties to make or receive copies. Mere interaction with a user through
126+a computer network, with no transfer of a copy, is not conveying.
127+
128+ An interactive user interface displays "Appropriate Legal Notices"
129+to the extent that it includes a convenient and prominently visible
130+feature that (1) displays an appropriate copyright notice, and (2)
131+tells the user that there is no warranty for the work (except to the
132+extent that warranties are provided), that licensees may convey the
133+work under this License, and how to view a copy of this License. If
134+the interface presents a list of user commands or options, such as a
135+menu, a prominent item in the list meets this criterion.
136+
137+ 1. Source Code.
138+
139+ The "source code" for a work means the preferred form of the work
140+for making modifications to it. "Object code" means any non-source
141+form of a work.
142+
143+ A "Standard Interface" means an interface that either is an official
144+standard defined by a recognized standards body, or, in the case of
145+interfaces specified for a particular programming language, one that
146+is widely used among developers working in that language.
147+
148+ The "System Libraries" of an executable work include anything, other
149+than the work as a whole, that (a) is included in the normal form of
150+packaging a Major Component, but which is not part of that Major
151+Component, and (b) serves only to enable use of the work with that
152+Major Component, or to implement a Standard Interface for which an
153+implementation is available to the public in source code form. A
154+"Major Component", in this context, means a major essential component
155+(kernel, window system, and so on) of the specific operating system
156+(if any) on which the executable work runs, or a compiler used to
157+produce the work, or an object code interpreter used to run it.
158+
159+ The "Corresponding Source" for a work in object code form means all
160+the source code needed to generate, install, and (for an executable
161+work) run the object code and to modify the work, including scripts to
162+control those activities. However, it does not include the work's
163+System Libraries, or general-purpose tools or generally available free
164+programs which are used unmodified in performing those activities but
165+which are not part of the work. For example, Corresponding Source
166+includes interface definition files associated with source files for
167+the work, and the source code for shared libraries and dynamically
168+linked subprograms that the work is specifically designed to require,
169+such as by intimate data communication or control flow between those
170+subprograms and other parts of the work.
171+
172+ The Corresponding Source need not include anything that users
173+can regenerate automatically from other parts of the Corresponding
174+Source.
175+
176+ The Corresponding Source for a work in source code form is that
177+same work.
178+
179+ 2. Basic Permissions.
180+
181+ All rights granted under this License are granted for the term of
182+copyright on the Program, and are irrevocable provided the stated
183+conditions are met. This License explicitly affirms your unlimited
184+permission to run the unmodified Program. The output from running a
185+covered work is covered by this License only if the output, given its
186+content, constitutes a covered work. This License acknowledges your
187+rights of fair use or other equivalent, as provided by copyright law.
188+
189+ You may make, run and propagate covered works that you do not
190+convey, without conditions so long as your license otherwise remains
191+in force. You may convey covered works to others for the sole purpose
192+of having them make modifications exclusively for you, or provide you
193+with facilities for running those works, provided that you comply with
194+the terms of this License in conveying all material for which you do
195+not control copyright. Those thus making or running the covered works
196+for you must do so exclusively on your behalf, under your direction
197+and control, on terms that prohibit them from making any copies of
198+your copyrighted material outside their relationship with you.
199+
200+ Conveying under any other circumstances is permitted solely under
201+the conditions stated below. Sublicensing is not allowed; section 10
202+makes it unnecessary.
203+
204+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
205+
206+ No covered work shall be deemed part of an effective technological
207+measure under any applicable law fulfilling obligations under article
208+11 of the WIPO copyright treaty adopted on 20 December 1996, or
209+similar laws prohibiting or restricting circumvention of such
210+measures.
211+
212+ When you convey a covered work, you waive any legal power to forbid
213+circumvention of technological measures to the extent such circumvention
214+is effected by exercising rights under this License with respect to
215+the covered work, and you disclaim any intention to limit operation or
216+modification of the work as a means of enforcing, against the work's
217+users, your or third parties' legal rights to forbid circumvention of
218+technological measures.
219+
220+ 4. Conveying Verbatim Copies.
221+
222+ You may convey verbatim copies of the Program's source code as you
223+receive it, in any medium, provided that you conspicuously and
224+appropriately publish on each copy an appropriate copyright notice;
225+keep intact all notices stating that this License and any
226+non-permissive terms added in accord with section 7 apply to the code;
227+keep intact all notices of the absence of any warranty; and give all
228+recipients a copy of this License along with the Program.
229+
230+ You may charge any price or no price for each copy that you convey,
231+and you may offer support or warranty protection for a fee.
232+
233+ 5. Conveying Modified Source Versions.
234+
235+ You may convey a work based on the Program, or the modifications to
236+produce it from the Program, in the form of source code under the
237+terms of section 4, provided that you also meet all of these conditions:
238+
239+ a) The work must carry prominent notices stating that you modified
240+ it, and giving a relevant date.
241+
242+ b) The work must carry prominent notices stating that it is
243+ released under this License and any conditions added under section
244+ 7. This requirement modifies the requirement in section 4 to
245+ "keep intact all notices".
246+
247+ c) You must license the entire work, as a whole, under this
248+ License to anyone who comes into possession of a copy. This
249+ License will therefore apply, along with any applicable section 7
250+ additional terms, to the whole of the work, and all its parts,
251+ regardless of how they are packaged. This License gives no
252+ permission to license the work in any other way, but it does not
253+ invalidate such permission if you have separately received it.
254+
255+ d) If the work has interactive user interfaces, each must display
256+ Appropriate Legal Notices; however, if the Program has interactive
257+ interfaces that do not display Appropriate Legal Notices, your
258+ work need not make them do so.
259+
260+ A compilation of a covered work with other separate and independent
261+works, which are not by their nature extensions of the covered work,
262+and which are not combined with it such as to form a larger program,
263+in or on a volume of a storage or distribution medium, is called an
264+"aggregate" if the compilation and its resulting copyright are not
265+used to limit the access or legal rights of the compilation's users
266+beyond what the individual works permit. Inclusion of a covered work
267+in an aggregate does not cause this License to apply to the other
268+parts of the aggregate.
269+
270+ 6. Conveying Non-Source Forms.
271+
272+ You may convey a covered work in object code form under the terms
273+of sections 4 and 5, provided that you also convey the
274+machine-readable Corresponding Source under the terms of this License,
275+in one of these ways:
276+
277+ a) Convey the object code in, or embodied in, a physical product
278+ (including a physical distribution medium), accompanied by the
279+ Corresponding Source fixed on a durable physical medium
280+ customarily used for software interchange.
281+
282+ b) Convey the object code in, or embodied in, a physical product
283+ (including a physical distribution medium), accompanied by a
284+ written offer, valid for at least three years and valid for as
285+ long as you offer spare parts or customer support for that product
286+ model, to give anyone who possesses the object code either (1) a
287+ copy of the Corresponding Source for all the software in the
288+ product that is covered by this License, on a durable physical
289+ medium customarily used for software interchange, for a price no
290+ more than your reasonable cost of physically performing this
291+ conveying of source, or (2) access to copy the
292+ Corresponding Source from a network server at no charge.
293+
294+ c) Convey individual copies of the object code with a copy of the
295+ written offer to provide the Corresponding Source. This
296+ alternative is allowed only occasionally and noncommercially, and
297+ only if you received the object code with such an offer, in accord
298+ with subsection 6b.
299+
300+ d) Convey the object code by offering access from a designated
301+ place (gratis or for a charge), and offer equivalent access to the
302+ Corresponding Source in the same way through the same place at no
303+ further charge. You need not require recipients to copy the
304+ Corresponding Source along with the object code. If the place to
305+ copy the object code is a network server, the Corresponding Source
306+ may be on a different server (operated by you or a third party)
307+ that supports equivalent copying facilities, provided you maintain
308+ clear directions next to the object code saying where to find the
309+ Corresponding Source. Regardless of what server hosts the
310+ Corresponding Source, you remain obligated to ensure that it is
311+ available for as long as needed to satisfy these requirements.
312+
313+ e) Convey the object code using peer-to-peer transmission, provided
314+ you inform other peers where the object code and Corresponding
315+ Source of the work are being offered to the general public at no
316+ charge under subsection 6d.
317+
318+ A separable portion of the object code, whose source code is excluded
319+from the Corresponding Source as a System Library, need not be
320+included in conveying the object code work.
321+
322+ A "User Product" is either (1) a "consumer product", which means any
323+tangible personal property which is normally used for personal, family,
324+or household purposes, or (2) anything designed or sold for incorporation
325+into a dwelling. In determining whether a product is a consumer product,
326+doubtful cases shall be resolved in favor of coverage. For a particular
327+product received by a particular user, "normally used" refers to a
328+typical or common use of that class of product, regardless of the status
329+of the particular user or of the way in which the particular user
330+actually uses, or expects or is expected to use, the product. A product
331+is a consumer product regardless of whether the product has substantial
332+commercial, industrial or non-consumer uses, unless such uses represent
333+the only significant mode of use of the product.
334+
335+ "Installation Information" for a User Product means any methods,
336+procedures, authorization keys, or other information required to install
337+and execute modified versions of a covered work in that User Product from
338+a modified version of its Corresponding Source. The information must
339+suffice to ensure that the continued functioning of the modified object
340+code is in no case prevented or interfered with solely because
341+modification has been made.
342+
343+ If you convey an object code work under this section in, or with, or
344+specifically for use in, a User Product, and the conveying occurs as
345+part of a transaction in which the right of possession and use of the
346+User Product is transferred to the recipient in perpetuity or for a
347+fixed term (regardless of how the transaction is characterized), the
348+Corresponding Source conveyed under this section must be accompanied
349+by the Installation Information. But this requirement does not apply
350+if neither you nor any third party retains the ability to install
351+modified object code on the User Product (for example, the work has
352+been installed in ROM).
353+
354+ The requirement to provide Installation Information does not include a
355+requirement to continue to provide support service, warranty, or updates
356+for a work that has been modified or installed by the recipient, or for
357+the User Product in which it has been modified or installed. Access to a
358+network may be denied when the modification itself materially and
359+adversely affects the operation of the network or violates the rules and
360+protocols for communication across the network.
361+
362+ Corresponding Source conveyed, and Installation Information provided,
363+in accord with this section must be in a format that is publicly
364+documented (and with an implementation available to the public in
365+source code form), and must require no special password or key for
366+unpacking, reading or copying.
367+
368+ 7. Additional Terms.
369+
370+ "Additional permissions" are terms that supplement the terms of this
371+License by making exceptions from one or more of its conditions.
372+Additional permissions that are applicable to the entire Program shall
373+be treated as though they were included in this License, to the extent
374+that they are valid under applicable law. If additional permissions
375+apply only to part of the Program, that part may be used separately
376+under those permissions, but the entire Program remains governed by
377+this License without regard to the additional permissions.
378+
379+ When you convey a copy of a covered work, you may at your option
380+remove any additional permissions from that copy, or from any part of
381+it. (Additional permissions may be written to require their own
382+removal in certain cases when you modify the work.) You may place
383+additional permissions on material, added by you to a covered work,
384+for which you have or can give appropriate copyright permission.
385+
386+ Notwithstanding any other provision of this License, for material you
387+add to a covered work, you may (if authorized by the copyright holders of
388+that material) supplement the terms of this License with terms:
389+
390+ a) Disclaiming warranty or limiting liability differently from the
391+ terms of sections 15 and 16 of this License; or
392+
393+ b) Requiring preservation of specified reasonable legal notices or
394+ author attributions in that material or in the Appropriate Legal
395+ Notices displayed by works containing it; or
396+
397+ c) Prohibiting misrepresentation of the origin of that material, or
398+ requiring that modified versions of such material be marked in
399+ reasonable ways as different from the original version; or
400+
401+ d) Limiting the use for publicity purposes of names of licensors or
402+ authors of the material; or
403+
404+ e) Declining to grant rights under trademark law for use of some
405+ trade names, trademarks, or service marks; or
406+
407+ f) Requiring indemnification of licensors and authors of that
408+ material by anyone who conveys the material (or modified versions of
409+ it) with contractual assumptions of liability to the recipient, for
410+ any liability that these contractual assumptions directly impose on
411+ those licensors and authors.
412+
413+ All other non-permissive additional terms are considered "further
414+restrictions" within the meaning of section 10. If the Program as you
415+received it, or any part of it, contains a notice stating that it is
416+governed by this License along with a term that is a further
417+restriction, you may remove that term. If a license document contains
418+a further restriction but permits relicensing or conveying under this
419+License, you may add to a covered work material governed by the terms
420+of that license document, provided that the further restriction does
421+not survive such relicensing or conveying.
422+
423+ If you add terms to a covered work in accord with this section, you
424+must place, in the relevant source files, a statement of the
425+additional terms that apply to those files, or a notice indicating
426+where to find the applicable terms.
427+
428+ Additional terms, permissive or non-permissive, may be stated in the
429+form of a separately written license, or stated as exceptions;
430+the above requirements apply either way.
431+
432+ 8. Termination.
433+
434+ You may not propagate or modify a covered work except as expressly
435+provided under this License. Any attempt otherwise to propagate or
436+modify it is void, and will automatically terminate your rights under
437+this License (including any patent licenses granted under the third
438+paragraph of section 11).
439+
440+ However, if you cease all violation of this License, then your
441+license from a particular copyright holder is reinstated (a)
442+provisionally, unless and until the copyright holder explicitly and
443+finally terminates your license, and (b) permanently, if the copyright
444+holder fails to notify you of the violation by some reasonable means
445+prior to 60 days after the cessation.
446+
447+ Moreover, your license from a particular copyright holder is
448+reinstated permanently if the copyright holder notifies you of the
449+violation by some reasonable means, this is the first time you have
450+received notice of violation of this License (for any work) from that
451+copyright holder, and you cure the violation prior to 30 days after
452+your receipt of the notice.
453+
454+ Termination of your rights under this section does not terminate the
455+licenses of parties who have received copies or rights from you under
456+this License. If your rights have been terminated and not permanently
457+reinstated, you do not qualify to receive new licenses for the same
458+material under section 10.
459+
460+ 9. Acceptance Not Required for Having Copies.
461+
462+ You are not required to accept this License in order to receive or
463+run a copy of the Program. Ancillary propagation of a covered work
464+occurring solely as a consequence of using peer-to-peer transmission
465+to receive a copy likewise does not require acceptance. However,
466+nothing other than this License grants you permission to propagate or
467+modify any covered work. These actions infringe copyright if you do
468+not accept this License. Therefore, by modifying or propagating a
469+covered work, you indicate your acceptance of this License to do so.
470+
471+ 10. Automatic Licensing of Downstream Recipients.
472+
473+ Each time you convey a covered work, the recipient automatically
474+receives a license from the original licensors, to run, modify and
475+propagate that work, subject to this License. You are not responsible
476+for enforcing compliance by third parties with this License.
477+
478+ An "entity transaction" is a transaction transferring control of an
479+organization, or substantially all assets of one, or subdividing an
480+organization, or merging organizations. If propagation of a covered
481+work results from an entity transaction, each party to that
482+transaction who receives a copy of the work also receives whatever
483+licenses to the work the party's predecessor in interest had or could
484+give under the previous paragraph, plus a right to possession of the
485+Corresponding Source of the work from the predecessor in interest, if
486+the predecessor has it or can get it with reasonable efforts.
487+
488+ You may not impose any further restrictions on the exercise of the
489+rights granted or affirmed under this License. For example, you may
490+not impose a license fee, royalty, or other charge for exercise of
491+rights granted under this License, and you may not initiate litigation
492+(including a cross-claim or counterclaim in a lawsuit) alleging that
493+any patent claim is infringed by making, using, selling, offering for
494+sale, or importing the Program or any portion of it.
495+
496+ 11. Patents.
497+
498+ A "contributor" is a copyright holder who authorizes use under this
499+License of the Program or a work on which the Program is based. The
500+work thus licensed is called the contributor's "contributor version".
501+
502+ A contributor's "essential patent claims" are all patent claims
503+owned or controlled by the contributor, whether already acquired or
504+hereafter acquired, that would be infringed by some manner, permitted
505+by this License, of making, using, or selling its contributor version,
506+but do not include claims that would be infringed only as a
507+consequence of further modification of the contributor version. For
508+purposes of this definition, "control" includes the right to grant
509+patent sublicenses in a manner consistent with the requirements of
510+this License.
511+
512+ Each contributor grants you a non-exclusive, worldwide, royalty-free
513+patent license under the contributor's essential patent claims, to
514+make, use, sell, offer for sale, import and otherwise run, modify and
515+propagate the contents of its contributor version.
516+
517+ In the following three paragraphs, a "patent license" is any express
518+agreement or commitment, however denominated, not to enforce a patent
519+(such as an express permission to practice a patent or covenant not to
520+sue for patent infringement). To "grant" such a patent license to a
521+party means to make such an agreement or commitment not to enforce a
522+patent against the party.
523+
524+ If you convey a covered work, knowingly relying on a patent license,
525+and the Corresponding Source of the work is not available for anyone
526+to copy, free of charge and under the terms of this License, through a
527+publicly available network server or other readily accessible means,
528+then you must either (1) cause the Corresponding Source to be so
529+available, or (2) arrange to deprive yourself of the benefit of the
530+patent license for this particular work, or (3) arrange, in a manner
531+consistent with the requirements of this License, to extend the patent
532+license to downstream recipients. "Knowingly relying" means you have
533+actual knowledge that, but for the patent license, your conveying the
534+covered work in a country, or your recipient's use of the covered work
535+in a country, would infringe one or more identifiable patents in that
536+country that you have reason to believe are valid.
537+
538+ If, pursuant to or in connection with a single transaction or
539+arrangement, you convey, or propagate by procuring conveyance of, a
540+covered work, and grant a patent license to some of the parties
541+receiving the covered work authorizing them to use, propagate, modify
542+or convey a specific copy of the covered work, then the patent license
543+you grant is automatically extended to all recipients of the covered
544+work and works based on it.
545+
546+ A patent license is "discriminatory" if it does not include within
547+the scope of its coverage, prohibits the exercise of, or is
548+conditioned on the non-exercise of one or more of the rights that are
549+specifically granted under this License. You may not convey a covered
550+work if you are a party to an arrangement with a third party that is
551+in the business of distributing software, under which you make payment
552+to the third party based on the extent of your activity of conveying
553+the work, and under which the third party grants, to any of the
554+parties who would receive the covered work from you, a discriminatory
555+patent license (a) in connection with copies of the covered work
556+conveyed by you (or copies made from those copies), or (b) primarily
557+for and in connection with specific products or compilations that
558+contain the covered work, unless you entered into that arrangement,
559+or that patent license was granted, prior to 28 March 2007.
560+
561+ Nothing in this License shall be construed as excluding or limiting
562+any implied license or other defenses to infringement that may
563+otherwise be available to you under applicable patent law.
564+
565+ 12. No Surrender of Others' Freedom.
566+
567+ If conditions are imposed on you (whether by court order, agreement or
568+otherwise) that contradict the conditions of this License, they do not
569+excuse you from the conditions of this License. If you cannot convey a
570+covered work so as to satisfy simultaneously your obligations under this
571+License and any other pertinent obligations, then as a consequence you may
572+not convey it at all. For example, if you agree to terms that obligate you
573+to collect a royalty for further conveying from those to whom you convey
574+the Program, the only way you could satisfy both those terms and this
575+License would be to refrain entirely from conveying the Program.
576+
577+ 13. Use with the GNU Affero General Public License.
578+
579+ Notwithstanding any other provision of this License, you have
580+permission to link or combine any covered work with a work licensed
581+under version 3 of the GNU Affero General Public License into a single
582+combined work, and to convey the resulting work. The terms of this
583+License will continue to apply to the part which is the covered work,
584+but the special requirements of the GNU Affero General Public License,
585+section 13, concerning interaction through a network will apply to the
586+combination as such.
587+
588+ 14. Revised Versions of this License.
589+
590+ The Free Software Foundation may publish revised and/or new versions of
591+the GNU General Public License from time to time. Such new versions will
592+be similar in spirit to the present version, but may differ in detail to
593+address new problems or concerns.
594+
595+ Each version is given a distinguishing version number. If the
596+Program specifies that a certain numbered version of the GNU General
597+Public License "or any later version" applies to it, you have the
598+option of following the terms and conditions either of that numbered
599+version or of any later version published by the Free Software
600+Foundation. If the Program does not specify a version number of the
601+GNU General Public License, you may choose any version ever published
602+by the Free Software Foundation.
603+
604+ If the Program specifies that a proxy can decide which future
605+versions of the GNU General Public License can be used, that proxy's
606+public statement of acceptance of a version permanently authorizes you
607+to choose that version for the Program.
608+
609+ Later license versions may give you additional or different
610+permissions. However, no additional obligations are imposed on any
611+author or copyright holder as a result of your choosing to follow a
612+later version.
613+
614+ 15. Disclaimer of Warranty.
615+
616+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
617+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
618+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
619+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
620+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
621+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
622+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
623+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
624+
625+ 16. Limitation of Liability.
626+
627+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
628+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
629+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
630+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
631+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
632+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
633+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
634+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
635+SUCH DAMAGES.
636+
637+ 17. Interpretation of Sections 15 and 16.
638+
639+ If the disclaimer of warranty and limitation of liability provided
640+above cannot be given local legal effect according to their terms,
641+reviewing courts shall apply local law that most closely approximates
642+an absolute waiver of all civil liability in connection with the
643+Program, unless a warranty or assumption of liability accompanies a
644+copy of the Program in return for a fee.
645+
646+ END OF TERMS AND CONDITIONS
647+
648+ How to Apply These Terms to Your New Programs
649+
650+ If you develop a new program, and you want it to be of the greatest
651+possible use to the public, the best way to achieve this is to make it
652+free software which everyone can redistribute and change under these terms.
653+
654+ To do so, attach the following notices to the program. It is safest
655+to attach them to the start of each source file to most effectively
656+state the exclusion of warranty; and each file should have at least
657+the "copyright" line and a pointer to where the full notice is found.
658+
659+ <one line to give the program's name and a brief idea of what it does.>
660+ Copyright (C) <year> <name of author>
661+
662+ This program is free software: you can redistribute it and/or modify
663+ it under the terms of the GNU General Public License as published by
664+ the Free Software Foundation, either version 3 of the License, or
665+ (at your option) any later version.
666+
667+ This program is distributed in the hope that it will be useful,
668+ but WITHOUT ANY WARRANTY; without even the implied warranty of
669+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
670+ GNU General Public License for more details.
671+
672+ You should have received a copy of the GNU General Public License
673+ along with this program. If not, see <http://www.gnu.org/licenses/>.
674+
675+Also add information on how to contact you by electronic and paper mail.
676+
677+ If the program does terminal interaction, make it output a short
678+notice like this when it starts in an interactive mode:
679+
680+ <program> Copyright (C) <year> <name of author>
681+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
682+ This is free software, and you are welcome to redistribute it
683+ under certain conditions; type `show c' for details.
684+
685+The hypothetical commands `show w' and `show c' should show the appropriate
686+parts of the General Public License. Of course, your program's commands
687+might be different; for a GUI interface, you would use an "about box".
688+
689+ You should also get your employer (if you work as a programmer) or school,
690+if any, to sign a "copyright disclaimer" for the program, if necessary.
691+For more information on this, and how to apply and follow the GNU GPL, see
692+<http://www.gnu.org/licenses/>.
693+
694+ The GNU General Public License does not permit incorporating your program
695+into proprietary programs. If your program is a subroutine library, you
696+may consider it more useful to permit linking proprietary applications with
697+the library. If this is what you want to do, use the GNU Lesser General
698+Public License instead of this License. But first, please read
699+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
700
701=== removed file 'README.md'
702--- README.md 2015-03-02 22:47:39 +0000
703+++ README.md 1970-01-01 00:00:00 +0000
704@@ -1,26 +0,0 @@
705-ADT proxy service
706-=================
707-
708-
709-Introduction
710-============
711-
712-`adt-proxy-service` is a microservice able to interpret and queue REST
713-test request.
714-
715-
716-Installing and Running
717-======================
718-
719-Install system dependencies::
720-
721- $ sudo apt-get install python-kombu python-configparser
722-
723-Sample configuration as '.adt-service.conf'::
724-
725- [amqp]
726- uris = amqp://guest:guest@localhost:5672//
727-
728-Running::
729-
730- $ ./adt-proxy-service.py -t amd64.nova -r 10
731
732=== added file 'README.rst'
733--- README.rst 1970-01-01 00:00:00 +0000
734+++ README.rst 2015-03-10 20:41:45 +0000
735@@ -0,0 +1,43 @@
736+ADT proxy service
737+##################
738+
739+Introduction
740+============
741+
742+`adt-proxy-service` is a microservice able to interpret and queue REST
743+test request.
744+
745+Installing and Running
746+======================
747+
748+Create and activate a virtualenv running python 3::
749+
750+ $ virtuelenv -p python3 ve
751+ $ . ve/bin/activate
752+
753+Install system dependencies::
754+
755+ $ pip install -r requirements.txt
756+
757+Sample configuration as '.adt-service.conf'::
758+
759+ [amqp]
760+ uris = amqp://guest:guest@localhost:5672//
761+
762+ [swift]
763+ public_url = http://some.swift.server.com/
764+
765+Running::
766+
767+ $ ./adt-request-proxy
768+
769+Running the Tests
770+=================
771+
772+Install the test requirements::
773+
774+ $ pip install -r test_requirements.txt
775+
776+Run the tests::
777+
778+ $ python setup.py test
779\ No newline at end of file
780
781=== renamed file 'adt-proxy-service.py' => 'adt-request-proxy.py'
782--- adt-proxy-service.py 2015-03-03 01:12:04 +0000
783+++ adt-request-proxy.py 2015-03-10 20:41:45 +0000
784@@ -1,82 +1,21 @@
785 #!/usr/bin/env python
786-
787-from __future__ import print_function
788-
789-import sys
790-
791-import argparse
792-import configparser
793-
794-import kombu
795-from kombu.log import get_logger
796-from kombu.pools import producers
797-from kombu.utils.debug import setup_logging
798-
799-
800-logger = get_logger(__name__)
801-
802-
803-def main():
804- setup_logging(loglevel='DEBUG', loggers=[''])
805-
806- parser = argparse.ArgumentParser(
807- description='ADT proxy service ...')
808- parser.add_argument('-c', '--conf', default='.adt-service.conf',
809- help='Configuration file path')
810- parser.add_argument('-t', '--tag', default='i386.nova',
811- help='Target worker tag (<arch>.<platform>)')
812- parser.add_argument('-r', '--requests', default=1, type=int,
813- help='Number of requests')
814-
815- args = parser.parse_args()
816- routing_key = args.tag
817- n_requests = args.requests
818-
819- # Load configuration options.
820- config = configparser.ConfigParser()
821- config.read(args.conf)
822- amqp_uris = config.get('amqp', 'uris').split()
823-
824-
825- # Bogus script based producer ...
826- arch, platform = routing_key.split('.')
827- payload = {
828- 'request_id': kombu.uuid(),
829- 'arch': arch,
830- 'platform': platform,
831- 'package_name': 'libpng',
832- 'nova_flavor': 'm1.medium',
833- 'nova_image': ('ubuntu-released/ubuntu-trusty-14.04-{}-server-'
834- '20150209.1-disk1.img'.format(arch)),
835- }
836-
837- adt_exchange = kombu.Exchange("adt.exchange", type="topic")
838- queue = kombu.Queue(
839- 'adt.requests.{}'.format(routing_key),
840- adt_exchange, routing_key=routing_key)
841-
842- # Always declare exchange and destination queue, even if there are no
843- # available works the request is preserved.
844- declare = [adt_exchange, queue]
845-
846- with kombu.Connection(amqp_uris) as conn:
847- with producers[conn].acquire(block=True) as producer:
848-
849- def errback(exc, interval):
850- logger.error('Error: %r', exc, exc_info=1)
851- logger.info('Retry in %s seconds.', interval)
852-
853- publish = conn.ensure(
854- producer, producer.publish,
855- errback=errback, max_retries=3)
856-
857- for i in range(n_requests):
858- payload['index'] = i
859- publish(
860- payload,
861- exchange=adt_exchange,
862- routing_key=routing_key,
863- declare=declare)
864+# adt-request-proxy
865+# Copyright (C) 2015 Canonical
866+#
867+# This program is free software: you can redistribute it and/or modify
868+# it under the terms of the GNU General Public License as published by
869+# the Free Software Foundation, either version 3 of the License, or
870+# (at your option) any later version.
871+#
872+# This program is distributed in the hope that it will be useful,
873+# but WITHOUT ANY WARRANTY; without even the implied warranty of
874+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
875+# GNU General Public License for more details.
876+#
877+# You should have received a copy of the GNU General Public License
878+# along with this program. If not, see <http://www.gnu.org/licenses/>.
879+#
880+from adt_request_proxy import main
881
882
883 if __name__ == '__main__':
884
885=== added directory 'adt_request_proxy'
886=== added file 'adt_request_proxy/__init__.py'
887--- adt_request_proxy/__init__.py 1970-01-01 00:00:00 +0000
888+++ adt_request_proxy/__init__.py 2015-03-10 20:41:45 +0000
889@@ -0,0 +1,69 @@
890+# adt-request-proxy
891+# Copyright (C) 2015 Canonical
892+#
893+# This program is free software: you can redistribute it and/or modify
894+# it under the terms of the GNU General Public License as published by
895+# the Free Software Foundation, either version 3 of the License, or
896+# (at your option) any later version.
897+#
898+# This program is distributed in the hope that it will be useful,
899+# but WITHOUT ANY WARRANTY; without even the implied warranty of
900+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
901+# GNU General Public License for more details.
902+#
903+# You should have received a copy of the GNU General Public License
904+# along with this program. If not, see <http://www.gnu.org/licenses/>.
905+#
906+
907+import configparser
908+
909+import flask
910+from kombu.utils.debug import setup_logging
911+import argparse
912+
913+
914+from adt_request_proxy import v1
915+from adt_request_proxy import errors
916+from adt_request_proxy.queue import RabbitQueuer
917+
918+def create_flask_app():
919+ app = flask.Flask('adt_cloud_worker')
920+
921+ app.add_url_rule(
922+ '/v1/test',
923+ 'test_new',
924+ v1.test_new,
925+ methods=['POST']
926+ )
927+
928+ @app.errorhandler(errors.MissingRequestParameters)
929+ def handle_invalid_usage(error):
930+ response = flask.jsonify(error.to_dict())
931+ response.status_code = error.status
932+ return response
933+
934+ return app
935+
936+
937+def main():
938+ setup_logging(loglevel='DEBUG', loggers=[''])
939+
940+ parser = argparse.ArgumentParser(
941+ description='ADT proxy service ...')
942+ parser.add_argument('-c', '--conf', default='.adt-service.conf',
943+ help='Configuration file path')
944+ args = parser.parse_args()
945+
946+
947+ app = create_flask_app()
948+
949+ # Load configuration options & create queuer
950+ config = configparser.ConfigParser()
951+ config.read(args.conf)
952+ app.extensions['rabbit'] = RabbitQueuer(config)
953+ app.config['SWIFT_URL'] = config['swift']['public_url']
954+
955+ app.run()
956+
957+if __name__ == '__main__':
958+ main()
959
960=== added file 'adt_request_proxy/errors.py'
961--- adt_request_proxy/errors.py 1970-01-01 00:00:00 +0000
962+++ adt_request_proxy/errors.py 2015-03-10 20:41:45 +0000
963@@ -0,0 +1,35 @@
964+# adt-request-proxy
965+# Copyright (C) 2015 Canonical
966+#
967+# This program is free software: you can redistribute it and/or modify
968+# it under the terms of the GNU General Public License as published by
969+# the Free Software Foundation, either version 3 of the License, or
970+# (at your option) any later version.
971+#
972+# This program is distributed in the hope that it will be useful,
973+# but WITHOUT ANY WARRANTY; without even the implied warranty of
974+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
975+# GNU General Public License for more details.
976+#
977+# You should have received a copy of the GNU General Public License
978+# along with this program. If not, see <http://www.gnu.org/licenses/>.
979+#
980+
981+"""Errors we raise from the request proxy."""
982+
983+
984+class MissingRequestParameters(Exception):
985+
986+ """Signal that one or more required parameters were missing."""
987+
988+ def __init__(self, missing_parameter_names, message=''):
989+ self.missing_parameter_names = missing_parameter_names
990+ self.additional_message = message
991+ self.status = 400
992+
993+ def to_dict(self):
994+ return {
995+ "message": "The following required parameters are missing: '%s'" \
996+ % ', '.join(self.missing_parameter_names),
997+ "additional_message": self.additional_message
998+ }
999
1000=== added file 'adt_request_proxy/queue.py'
1001--- adt_request_proxy/queue.py 1970-01-01 00:00:00 +0000
1002+++ adt_request_proxy/queue.py 2015-03-10 20:41:45 +0000
1003@@ -0,0 +1,80 @@
1004+# adt-request-proxy
1005+# Copyright (C) 2015 Canonical
1006+#
1007+# This program is free software: you can redistribute it and/or modify
1008+# it under the terms of the GNU General Public License as published by
1009+# the Free Software Foundation, either version 3 of the License, or
1010+# (at your option) any later version.
1011+#
1012+# This program is distributed in the hope that it will be useful,
1013+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1014+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1015+# GNU General Public License for more details.
1016+#
1017+# You should have received a copy of the GNU General Public License
1018+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1019+#
1020+
1021+"""Functions that interract with the rabbitmq daemon."""
1022+
1023+import kombu
1024+from kombu.pools import producers
1025+from kombu.common import uuid
1026+
1027+
1028+class RabbitQueuer(object):
1029+ """A class that can send things to the rabbit queue. An instance of this
1030+ is stored in 'flask.g'.
1031+
1032+ TODO: This code can almost certainly be improved - for example, maybe
1033+ don't create a new connection every time we queue something?
1034+
1035+ """
1036+
1037+ def __init__(self, config):
1038+ self.amqp_uris = config.get('amqp', 'uris').split()
1039+ self.adt_exchange = kombu.Exchange("adt.exchange", type="topic")
1040+
1041+ def queue_test(self, payload):
1042+ """Take 'payload' and enqueue it on the rabbit queue.
1043+
1044+ 'payload' must be a dictionary, and must *not* contain a 'request_id'
1045+ key.
1046+
1047+ Upon success, returns a request_id which should be communicated to the
1048+ client.
1049+
1050+ On error, an exception will be raised.
1051+
1052+ """
1053+ routing_key = payload['arch'] + '.' + payload['platform']
1054+ queue = kombu.Queue(
1055+ 'adt.requests.{}'.format(routing_key),
1056+ self.adt_exchange, routing_key=routing_key)
1057+
1058+ # Always declare exchange and destination queue, even if there are no
1059+ # available works the request is preserved.
1060+ declare = [self.adt_exchange, queue]
1061+
1062+ connection = kombu.Connection(self.amqp_uris)
1063+ payload['request_id'] = uuid()
1064+
1065+ with producers[connection].acquire(block=True) as producer:
1066+
1067+ def errback(exc, interval):
1068+ # TODO: This should raise an exception if something goes wrong.
1069+ # the exception should be registerred with flask, so we
1070+ # automatically return something nice and RESTful to the user
1071+ # see: adt_request_proxy.errors.
1072+ logger.error('Error: %r', exc, exc_info=1)
1073+ logger.info('Retry in %s seconds.', interval)
1074+
1075+ publish = connection.ensure(
1076+ producer, producer.publish,
1077+ errback=errback, max_retries=3)
1078+ publish(
1079+ payload,
1080+ exchange=self.adt_exchange,
1081+ routing_key=routing_key,
1082+ declare=declare)
1083+ return payload['request_id']
1084
1085=== added directory 'adt_request_proxy/tests'
1086=== added file 'adt_request_proxy/tests/__init__.py'
1087--- adt_request_proxy/tests/__init__.py 1970-01-01 00:00:00 +0000
1088+++ adt_request_proxy/tests/__init__.py 2015-03-10 20:41:45 +0000
1089@@ -0,0 +1,18 @@
1090+# adt-request-proxy
1091+# Copyright (C) 2015 Canonical
1092+#
1093+# This program is free software: you can redistribute it and/or modify
1094+# it under the terms of the GNU General Public License as published by
1095+# the Free Software Foundation, either version 3 of the License, or
1096+# (at your option) any later version.
1097+#
1098+# This program is distributed in the hope that it will be useful,
1099+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1100+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1101+# GNU General Public License for more details.
1102+#
1103+# You should have received a copy of the GNU General Public License
1104+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1105+#
1106+
1107+"""Package for tests, unit and functional alike."""
1108
1109=== added file 'adt_request_proxy/tests/test_functional.py'
1110--- adt_request_proxy/tests/test_functional.py 1970-01-01 00:00:00 +0000
1111+++ adt_request_proxy/tests/test_functional.py 2015-03-10 20:41:45 +0000
1112@@ -0,0 +1,62 @@
1113+# adt-request-proxy
1114+# Copyright (C) 2015 Canonical
1115+#
1116+# This program is free software: you can redistribute it and/or modify
1117+# it under the terms of the GNU General Public License as published by
1118+# the Free Software Foundation, either version 3 of the License, or
1119+# (at your option) any later version.
1120+#
1121+# This program is distributed in the hope that it will be useful,
1122+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1123+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1124+# GNU General Public License for more details.
1125+#
1126+# You should have received a copy of the GNU General Public License
1127+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1128+#
1129+
1130+"""Full-stack functional tests for the web application."""
1131+
1132+import testtools
1133+from testtools.matchers import Equals
1134+
1135+import adt_request_proxy
1136+
1137+
1138+class FunctionalWebAppTests(testtools.TestCase):
1139+
1140+ """A suite of functional tests for the web app.
1141+
1142+ Tests are reasonably simple to write: 'self.client' is a
1143+ 'werkzeug.test.Client', and can make get/post etc calls. Query response
1144+ objects to make sure you got what you expected.
1145+
1146+ A few things still need to be done however: for testing, we want to tweak
1147+ the queues requests end up on, since we (probably) want these tests to
1148+ run on production deployments without the adt-cloud-worker picking up our
1149+ test requests.
1150+
1151+ """
1152+
1153+ def setUp(self):
1154+ super().setUp()
1155+ self.server_app = adt_request_proxy.create_flask_app()
1156+ self.server_app.config['TESTING'] = True
1157+ self.client = self.server_app.test_client()
1158+
1159+ def assertEndpointDisallowsMethods(self, endpoint, methods):
1160+ for method in methods:
1161+ fn = getattr(self.client, method.lower(), None)
1162+ if fn and callable(fn):
1163+ resp = fn(endpoint)
1164+ self.expectThat(resp.status_code, Equals(405))
1165+ else:
1166+ self.fail("Unknown method %s" % method)
1167+
1168+ def test_v1_test_endpoint_is_POST_only(self):
1169+ self.assertEndpointDisallowsMethods(
1170+ '/v1/test',
1171+ ['GET', 'PATCH', 'DELETE']
1172+ )
1173+
1174+ # TODO: add more tests here ;)
1175
1176=== added file 'adt_request_proxy/v1.py'
1177--- adt_request_proxy/v1.py 1970-01-01 00:00:00 +0000
1178+++ adt_request_proxy/v1.py 2015-03-10 20:41:45 +0000
1179@@ -0,0 +1,57 @@
1180+# adt-request-proxy
1181+# Copyright (C) 2015 Canonical
1182+#
1183+# This program is free software: you can redistribute it and/or modify
1184+# it under the terms of the GNU General Public License as published by
1185+# the Free Software Foundation, either version 3 of the License, or
1186+# (at your option) any later version.
1187+#
1188+# This program is distributed in the hope that it will be useful,
1189+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1190+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1191+# GNU General Public License for more details.
1192+#
1193+# You should have received a copy of the GNU General Public License
1194+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1195+#
1196+
1197+"""Version 1 restful service web code."""
1198+
1199+import urllib.parse
1200+
1201+from flask import current_app, request, url_for, jsonify
1202+
1203+from adt_request_proxy.errors import MissingRequestParameters
1204+
1205+def test_new():
1206+ required_keys = {
1207+ 'package-name',
1208+ 'architecture',
1209+ 'platform',
1210+ }
1211+ missing = required_keys.difference(set(request.form.keys()))
1212+ if missing:
1213+ raise MissingRequestParameters(missing)
1214+
1215+ rabbit_request = dict()
1216+ rabbit_request['package_name'] = request.form['package-name']
1217+ if 'apt-pocket' in request.form:
1218+ rabbit_request['apt_pocket'] = request.form.get('apt-pocket')
1219+ rabbit_request['arch'] = arch = request.form['architecture']
1220+ rabbit_request['platform'] = request.form['platform']
1221+ rabbit_request['nova_image'] = (
1222+ 'ubuntu-released/ubuntu-trusty-14.04-{}'
1223+ '-server-20150209.1-disk1.img'.format(arch)
1224+ )
1225+
1226+ req_id = current_app.extensions['rabbit'].queue_test(rabbit_request)
1227+ return jsonify(
1228+ {
1229+ 'status': 'request processed',
1230+ 'request_id': req_id,
1231+ 'result_url': urllib.parse.urljoin(
1232+ current_app.config['SWIFT_URL'], req_id + '/results.tgz'
1233+ )
1234+ }
1235+ )
1236+ return repr(request.form)
1237
1238=== added file 'requirements.txt'
1239--- requirements.txt 1970-01-01 00:00:00 +0000
1240+++ requirements.txt 2015-03-10 20:41:45 +0000
1241@@ -0,0 +1,2 @@
1242+flask==0.10.1
1243+kombu==3.0.24
1244\ No newline at end of file
1245
1246=== added file 'setup.py'
1247--- setup.py 1970-01-01 00:00:00 +0000
1248+++ setup.py 2015-03-10 20:41:45 +0000
1249@@ -0,0 +1,42 @@
1250+#!/usr/bin/env python3
1251+
1252+#
1253+# adt-cloud-worker
1254+# Copyright (C) 2015 Canonical
1255+#
1256+# This program is free software: you can redistribute it and/or modify
1257+# it under the terms of the GNU General Public License as published by
1258+# the Free Software Foundation, either version 3 of the License, or
1259+# (at your option) any later version.
1260+#
1261+# This program is distributed in the hope that it will be useful,
1262+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1263+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1264+# GNU General Public License for more details.
1265+#
1266+# You should have received a copy of the GNU General Public License
1267+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1268+#
1269+
1270+import sys
1271+assert sys.version_info >= (3,), 'Python 3 is required'
1272+
1273+from setuptools import find_packages, setup, Extension
1274+
1275+
1276+VERSION = '1.0.0'
1277+
1278+
1279+
1280+setup(
1281+ name='adt-request-proxy',
1282+ version=VERSION,
1283+ description='A microservice that queues test runs via a RESTful interface.',
1284+ author='Canonical CI Engineering Team',
1285+ author_email='canonical-ci-engineering@lists.launchpad.net',
1286+ url='https://launchpad.net/adt-cloud-worker',
1287+ license='GPLv3',
1288+ packages=find_packages(),
1289+ test_suite='adt_request_proxy.tests',
1290+ scripts=['adt-request-proxy.py']
1291+)
1292
1293=== added file 'test_requirements.txt'
1294--- test_requirements.txt 1970-01-01 00:00:00 +0000
1295+++ test_requirements.txt 2015-03-10 20:41:45 +0000
1296@@ -0,0 +1,1 @@
1297+testtools==1.5.0
1298\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: