Merge lp:~thumper/golxc/mockable into lp:golxc

Proposed by Tim Penhey on 2013-06-14
Status: Merged
Merged at revision: 5
Proposed branch: lp:~thumper/golxc/mockable
Merge into: lp:golxc
Diff against target: 1504 lines (+1044/-91)
8 files modified
COPYING (+674/-0)
COPYING.LESSER (+165/-0)
LICENSE (+15/-0)
config.go (+3/-0)
export_test.go (+5/-2)
golxc.go (+133/-45)
golxc_test.go (+46/-44)
network.go (+3/-0)
To merge this branch: bzr merge lp:~thumper/golxc/mockable
Reviewer Review Type Date Requested Status
Frank Mueller (community) 2013-06-14 Approve on 2013-06-14
Ian Booth Approve on 2013-06-14
Review via email: mp+169317@code.launchpad.net

Description of the change

Provide interfaces around the core parts.

In order to provide meaningful tests around code that is using golxc
without shelling out to real lxc commands, we need to depend only on
interfaces. The two main package level functions, New and List are
now methods on a ContainerFactory. The instances themselves implement
Container. Since this is now an interface, added methods for getting
and setting the log file and level.

Also, Create now takes a config file option. I found through trial
and error that if you specify a mount point in the config file, and
only pass that config file through at Start time, the mount
fails. However passing exactly the same config file through at Create
time, and not at Start time has it succeed.

To post a comment you must log in.
Tim Penhey (thumper) wrote :

Please take a look.

lp:~thumper/golxc/mockable updated on 2013-06-14
7. By Tim Penhey on 2013-06-14

Add license files and headers.

Tim Penhey (thumper) wrote :

Also added license files and headers.

Tim Penhey (thumper) wrote :

Also, perhaps we could change ownership of trunk to ~juju-core?

Ian Booth (wallyworld) wrote :

Trivials:

English:
931 + // Clone creates a copy of the container, it gets the given name.
932 + Clone(name string) (Container, error)

Perhaps: // Clone creates a copy of the container, giving the copy the specified name.

962 + // LogLevel returns the current logging level, this is only used if the
963 + // LogFile is not "".
964 + LogLevel() LogLevel

Perhaps: // LogLevel returns the current logging level (only used if the LogFile is not "").

Also, some comments have "." at the end, others don't.

 +// ContainerFactory represents the methods used to create Containers.
971 +type ContainerFactory interface {
972 + // New returns a container instance which can then be used for operations
973 + // like Create(), Start(), Stop() or Destroy().
974 + New(string) Container
975 + List() ([]Container, error)
976 +}

Please add a comment for List(). I know there's one on the method implementation, but the interface is where you really want to see the comment.

review: Approve
Tim Penhey (thumper) wrote :

On 14/06/13 12:51, Ian Booth wrote:
> Review: Approve
>
> Trivials:
>
> English:
> 931 + // Clone creates a copy of the container, it gets the given name.
> 932 + Clone(name string) (Container, error)
>
> Perhaps: // Clone creates a copy of the container, giving the copy the specified name.

Done.

> 962 + // LogLevel returns the current logging level, this is only used if the
> 963 + // LogFile is not "".
> 964 + LogLevel() LogLevel
>
> Perhaps: // LogLevel returns the current logging level (only used if the LogFile is not "").
>
> Also, some comments have "." at the end, others don't.

I think they should be valid sentences.

> +// ContainerFactory represents the methods used to create Containers.
> 971 +type ContainerFactory interface {
> 972 + // New returns a container instance which can then be used for operations
> 973 + // like Create(), Start(), Stop() or Destroy().
> 974 + New(string) Container
> 975 + List() ([]Container, error)
> 976 +}
>
> Please add a comment for List(). I know there's one on the method implementation, but the interface is where you really want to see the comment.

Done.

lp:~thumper/golxc/mockable updated on 2013-06-14
8. By Tim Penhey on 2013-06-14

Comment fixes.

9. By Tim Penhey on 2013-06-14

Fix the tests.

Frank Mueller (themue) wrote :

In a discussion we decided to just wrap the needed LXC commands inside juju-core, but it's nice to see this package alive and with these good changes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'COPYING'
2--- COPYING 1970-01-01 00:00:00 +0000
3+++ COPYING 2013-06-14 03:35:36 +0000
4@@ -0,0 +1,674 @@
5+ GNU GENERAL PUBLIC LICENSE
6+ Version 3, 29 June 2007
7+
8+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
9+ Everyone is permitted to copy and distribute verbatim copies
10+ of this license document, but changing it is not allowed.
11+
12+ Preamble
13+
14+ The GNU General Public License is a free, copyleft license for
15+software and other kinds of works.
16+
17+ The licenses for most software and other practical works are designed
18+to take away your freedom to share and change the works. By contrast,
19+the GNU General Public License is intended to guarantee your freedom to
20+share and change all versions of a program--to make sure it remains free
21+software for all its users. We, the Free Software Foundation, use the
22+GNU General Public License for most of our software; it applies also to
23+any other work released this way by its authors. You can apply it to
24+your programs, too.
25+
26+ When we speak of free software, we are referring to freedom, not
27+price. Our General Public Licenses are designed to make sure that you
28+have the freedom to distribute copies of free software (and charge for
29+them if you wish), that you receive source code or can get it if you
30+want it, that you can change the software or use pieces of it in new
31+free programs, and that you know you can do these things.
32+
33+ To protect your rights, we need to prevent others from denying you
34+these rights or asking you to surrender the rights. Therefore, you have
35+certain responsibilities if you distribute copies of the software, or if
36+you modify it: responsibilities to respect the freedom of others.
37+
38+ For example, if you distribute copies of such a program, whether
39+gratis or for a fee, you must pass on to the recipients the same
40+freedoms that you received. You must make sure that they, too, receive
41+or can get the source code. And you must show them these terms so they
42+know their rights.
43+
44+ Developers that use the GNU GPL protect your rights with two steps:
45+(1) assert copyright on the software, and (2) offer you this License
46+giving you legal permission to copy, distribute and/or modify it.
47+
48+ For the developers' and authors' protection, the GPL clearly explains
49+that there is no warranty for this free software. For both users' and
50+authors' sake, the GPL requires that modified versions be marked as
51+changed, so that their problems will not be attributed erroneously to
52+authors of previous versions.
53+
54+ Some devices are designed to deny users access to install or run
55+modified versions of the software inside them, although the manufacturer
56+can do so. This is fundamentally incompatible with the aim of
57+protecting users' freedom to change the software. The systematic
58+pattern of such abuse occurs in the area of products for individuals to
59+use, which is precisely where it is most unacceptable. Therefore, we
60+have designed this version of the GPL to prohibit the practice for those
61+products. If such problems arise substantially in other domains, we
62+stand ready to extend this provision to those domains in future versions
63+of the GPL, as needed to protect the freedom of users.
64+
65+ Finally, every program is threatened constantly by software patents.
66+States should not allow patents to restrict development and use of
67+software on general-purpose computers, but in those that do, we wish to
68+avoid the special danger that patents applied to a free program could
69+make it effectively proprietary. To prevent this, the GPL assures that
70+patents cannot be used to render the program non-free.
71+
72+ The precise terms and conditions for copying, distribution and
73+modification follow.
74+
75+ TERMS AND CONDITIONS
76+
77+ 0. Definitions.
78+
79+ "This License" refers to version 3 of the GNU General Public License.
80+
81+ "Copyright" also means copyright-like laws that apply to other kinds of
82+works, such as semiconductor masks.
83+
84+ "The Program" refers to any copyrightable work licensed under this
85+License. Each licensee is addressed as "you". "Licensees" and
86+"recipients" may be individuals or organizations.
87+
88+ To "modify" a work means to copy from or adapt all or part of the work
89+in a fashion requiring copyright permission, other than the making of an
90+exact copy. The resulting work is called a "modified version" of the
91+earlier work or a work "based on" the earlier work.
92+
93+ A "covered work" means either the unmodified Program or a work based
94+on the Program.
95+
96+ To "propagate" a work means to do anything with it that, without
97+permission, would make you directly or secondarily liable for
98+infringement under applicable copyright law, except executing it on a
99+computer or modifying a private copy. Propagation includes copying,
100+distribution (with or without modification), making available to the
101+public, and in some countries other activities as well.
102+
103+ To "convey" a work means any kind of propagation that enables other
104+parties to make or receive copies. Mere interaction with a user through
105+a computer network, with no transfer of a copy, is not conveying.
106+
107+ An interactive user interface displays "Appropriate Legal Notices"
108+to the extent that it includes a convenient and prominently visible
109+feature that (1) displays an appropriate copyright notice, and (2)
110+tells the user that there is no warranty for the work (except to the
111+extent that warranties are provided), that licensees may convey the
112+work under this License, and how to view a copy of this License. If
113+the interface presents a list of user commands or options, such as a
114+menu, a prominent item in the list meets this criterion.
115+
116+ 1. Source Code.
117+
118+ The "source code" for a work means the preferred form of the work
119+for making modifications to it. "Object code" means any non-source
120+form of a work.
121+
122+ A "Standard Interface" means an interface that either is an official
123+standard defined by a recognized standards body, or, in the case of
124+interfaces specified for a particular programming language, one that
125+is widely used among developers working in that language.
126+
127+ The "System Libraries" of an executable work include anything, other
128+than the work as a whole, that (a) is included in the normal form of
129+packaging a Major Component, but which is not part of that Major
130+Component, and (b) serves only to enable use of the work with that
131+Major Component, or to implement a Standard Interface for which an
132+implementation is available to the public in source code form. A
133+"Major Component", in this context, means a major essential component
134+(kernel, window system, and so on) of the specific operating system
135+(if any) on which the executable work runs, or a compiler used to
136+produce the work, or an object code interpreter used to run it.
137+
138+ The "Corresponding Source" for a work in object code form means all
139+the source code needed to generate, install, and (for an executable
140+work) run the object code and to modify the work, including scripts to
141+control those activities. However, it does not include the work's
142+System Libraries, or general-purpose tools or generally available free
143+programs which are used unmodified in performing those activities but
144+which are not part of the work. For example, Corresponding Source
145+includes interface definition files associated with source files for
146+the work, and the source code for shared libraries and dynamically
147+linked subprograms that the work is specifically designed to require,
148+such as by intimate data communication or control flow between those
149+subprograms and other parts of the work.
150+
151+ The Corresponding Source need not include anything that users
152+can regenerate automatically from other parts of the Corresponding
153+Source.
154+
155+ The Corresponding Source for a work in source code form is that
156+same work.
157+
158+ 2. Basic Permissions.
159+
160+ All rights granted under this License are granted for the term of
161+copyright on the Program, and are irrevocable provided the stated
162+conditions are met. This License explicitly affirms your unlimited
163+permission to run the unmodified Program. The output from running a
164+covered work is covered by this License only if the output, given its
165+content, constitutes a covered work. This License acknowledges your
166+rights of fair use or other equivalent, as provided by copyright law.
167+
168+ You may make, run and propagate covered works that you do not
169+convey, without conditions so long as your license otherwise remains
170+in force. You may convey covered works to others for the sole purpose
171+of having them make modifications exclusively for you, or provide you
172+with facilities for running those works, provided that you comply with
173+the terms of this License in conveying all material for which you do
174+not control copyright. Those thus making or running the covered works
175+for you must do so exclusively on your behalf, under your direction
176+and control, on terms that prohibit them from making any copies of
177+your copyrighted material outside their relationship with you.
178+
179+ Conveying under any other circumstances is permitted solely under
180+the conditions stated below. Sublicensing is not allowed; section 10
181+makes it unnecessary.
182+
183+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
184+
185+ No covered work shall be deemed part of an effective technological
186+measure under any applicable law fulfilling obligations under article
187+11 of the WIPO copyright treaty adopted on 20 December 1996, or
188+similar laws prohibiting or restricting circumvention of such
189+measures.
190+
191+ When you convey a covered work, you waive any legal power to forbid
192+circumvention of technological measures to the extent such circumvention
193+is effected by exercising rights under this License with respect to
194+the covered work, and you disclaim any intention to limit operation or
195+modification of the work as a means of enforcing, against the work's
196+users, your or third parties' legal rights to forbid circumvention of
197+technological measures.
198+
199+ 4. Conveying Verbatim Copies.
200+
201+ You may convey verbatim copies of the Program's source code as you
202+receive it, in any medium, provided that you conspicuously and
203+appropriately publish on each copy an appropriate copyright notice;
204+keep intact all notices stating that this License and any
205+non-permissive terms added in accord with section 7 apply to the code;
206+keep intact all notices of the absence of any warranty; and give all
207+recipients a copy of this License along with the Program.
208+
209+ You may charge any price or no price for each copy that you convey,
210+and you may offer support or warranty protection for a fee.
211+
212+ 5. Conveying Modified Source Versions.
213+
214+ You may convey a work based on the Program, or the modifications to
215+produce it from the Program, in the form of source code under the
216+terms of section 4, provided that you also meet all of these conditions:
217+
218+ a) The work must carry prominent notices stating that you modified
219+ it, and giving a relevant date.
220+
221+ b) The work must carry prominent notices stating that it is
222+ released under this License and any conditions added under section
223+ 7. This requirement modifies the requirement in section 4 to
224+ "keep intact all notices".
225+
226+ c) You must license the entire work, as a whole, under this
227+ License to anyone who comes into possession of a copy. This
228+ License will therefore apply, along with any applicable section 7
229+ additional terms, to the whole of the work, and all its parts,
230+ regardless of how they are packaged. This License gives no
231+ permission to license the work in any other way, but it does not
232+ invalidate such permission if you have separately received it.
233+
234+ d) If the work has interactive user interfaces, each must display
235+ Appropriate Legal Notices; however, if the Program has interactive
236+ interfaces that do not display Appropriate Legal Notices, your
237+ work need not make them do so.
238+
239+ A compilation of a covered work with other separate and independent
240+works, which are not by their nature extensions of the covered work,
241+and which are not combined with it such as to form a larger program,
242+in or on a volume of a storage or distribution medium, is called an
243+"aggregate" if the compilation and its resulting copyright are not
244+used to limit the access or legal rights of the compilation's users
245+beyond what the individual works permit. Inclusion of a covered work
246+in an aggregate does not cause this License to apply to the other
247+parts of the aggregate.
248+
249+ 6. Conveying Non-Source Forms.
250+
251+ You may convey a covered work in object code form under the terms
252+of sections 4 and 5, provided that you also convey the
253+machine-readable Corresponding Source under the terms of this License,
254+in one of these ways:
255+
256+ a) Convey the object code in, or embodied in, a physical product
257+ (including a physical distribution medium), accompanied by the
258+ Corresponding Source fixed on a durable physical medium
259+ customarily used for software interchange.
260+
261+ b) Convey the object code in, or embodied in, a physical product
262+ (including a physical distribution medium), accompanied by a
263+ written offer, valid for at least three years and valid for as
264+ long as you offer spare parts or customer support for that product
265+ model, to give anyone who possesses the object code either (1) a
266+ copy of the Corresponding Source for all the software in the
267+ product that is covered by this License, on a durable physical
268+ medium customarily used for software interchange, for a price no
269+ more than your reasonable cost of physically performing this
270+ conveying of source, or (2) access to copy the
271+ Corresponding Source from a network server at no charge.
272+
273+ c) Convey individual copies of the object code with a copy of the
274+ written offer to provide the Corresponding Source. This
275+ alternative is allowed only occasionally and noncommercially, and
276+ only if you received the object code with such an offer, in accord
277+ with subsection 6b.
278+
279+ d) Convey the object code by offering access from a designated
280+ place (gratis or for a charge), and offer equivalent access to the
281+ Corresponding Source in the same way through the same place at no
282+ further charge. You need not require recipients to copy the
283+ Corresponding Source along with the object code. If the place to
284+ copy the object code is a network server, the Corresponding Source
285+ may be on a different server (operated by you or a third party)
286+ that supports equivalent copying facilities, provided you maintain
287+ clear directions next to the object code saying where to find the
288+ Corresponding Source. Regardless of what server hosts the
289+ Corresponding Source, you remain obligated to ensure that it is
290+ available for as long as needed to satisfy these requirements.
291+
292+ e) Convey the object code using peer-to-peer transmission, provided
293+ you inform other peers where the object code and Corresponding
294+ Source of the work are being offered to the general public at no
295+ charge under subsection 6d.
296+
297+ A separable portion of the object code, whose source code is excluded
298+from the Corresponding Source as a System Library, need not be
299+included in conveying the object code work.
300+
301+ A "User Product" is either (1) a "consumer product", which means any
302+tangible personal property which is normally used for personal, family,
303+or household purposes, or (2) anything designed or sold for incorporation
304+into a dwelling. In determining whether a product is a consumer product,
305+doubtful cases shall be resolved in favor of coverage. For a particular
306+product received by a particular user, "normally used" refers to a
307+typical or common use of that class of product, regardless of the status
308+of the particular user or of the way in which the particular user
309+actually uses, or expects or is expected to use, the product. A product
310+is a consumer product regardless of whether the product has substantial
311+commercial, industrial or non-consumer uses, unless such uses represent
312+the only significant mode of use of the product.
313+
314+ "Installation Information" for a User Product means any methods,
315+procedures, authorization keys, or other information required to install
316+and execute modified versions of a covered work in that User Product from
317+a modified version of its Corresponding Source. The information must
318+suffice to ensure that the continued functioning of the modified object
319+code is in no case prevented or interfered with solely because
320+modification has been made.
321+
322+ If you convey an object code work under this section in, or with, or
323+specifically for use in, a User Product, and the conveying occurs as
324+part of a transaction in which the right of possession and use of the
325+User Product is transferred to the recipient in perpetuity or for a
326+fixed term (regardless of how the transaction is characterized), the
327+Corresponding Source conveyed under this section must be accompanied
328+by the Installation Information. But this requirement does not apply
329+if neither you nor any third party retains the ability to install
330+modified object code on the User Product (for example, the work has
331+been installed in ROM).
332+
333+ The requirement to provide Installation Information does not include a
334+requirement to continue to provide support service, warranty, or updates
335+for a work that has been modified or installed by the recipient, or for
336+the User Product in which it has been modified or installed. Access to a
337+network may be denied when the modification itself materially and
338+adversely affects the operation of the network or violates the rules and
339+protocols for communication across the network.
340+
341+ Corresponding Source conveyed, and Installation Information provided,
342+in accord with this section must be in a format that is publicly
343+documented (and with an implementation available to the public in
344+source code form), and must require no special password or key for
345+unpacking, reading or copying.
346+
347+ 7. Additional Terms.
348+
349+ "Additional permissions" are terms that supplement the terms of this
350+License by making exceptions from one or more of its conditions.
351+Additional permissions that are applicable to the entire Program shall
352+be treated as though they were included in this License, to the extent
353+that they are valid under applicable law. If additional permissions
354+apply only to part of the Program, that part may be used separately
355+under those permissions, but the entire Program remains governed by
356+this License without regard to the additional permissions.
357+
358+ When you convey a copy of a covered work, you may at your option
359+remove any additional permissions from that copy, or from any part of
360+it. (Additional permissions may be written to require their own
361+removal in certain cases when you modify the work.) You may place
362+additional permissions on material, added by you to a covered work,
363+for which you have or can give appropriate copyright permission.
364+
365+ Notwithstanding any other provision of this License, for material you
366+add to a covered work, you may (if authorized by the copyright holders of
367+that material) supplement the terms of this License with terms:
368+
369+ a) Disclaiming warranty or limiting liability differently from the
370+ terms of sections 15 and 16 of this License; or
371+
372+ b) Requiring preservation of specified reasonable legal notices or
373+ author attributions in that material or in the Appropriate Legal
374+ Notices displayed by works containing it; or
375+
376+ c) Prohibiting misrepresentation of the origin of that material, or
377+ requiring that modified versions of such material be marked in
378+ reasonable ways as different from the original version; or
379+
380+ d) Limiting the use for publicity purposes of names of licensors or
381+ authors of the material; or
382+
383+ e) Declining to grant rights under trademark law for use of some
384+ trade names, trademarks, or service marks; or
385+
386+ f) Requiring indemnification of licensors and authors of that
387+ material by anyone who conveys the material (or modified versions of
388+ it) with contractual assumptions of liability to the recipient, for
389+ any liability that these contractual assumptions directly impose on
390+ those licensors and authors.
391+
392+ All other non-permissive additional terms are considered "further
393+restrictions" within the meaning of section 10. If the Program as you
394+received it, or any part of it, contains a notice stating that it is
395+governed by this License along with a term that is a further
396+restriction, you may remove that term. If a license document contains
397+a further restriction but permits relicensing or conveying under this
398+License, you may add to a covered work material governed by the terms
399+of that license document, provided that the further restriction does
400+not survive such relicensing or conveying.
401+
402+ If you add terms to a covered work in accord with this section, you
403+must place, in the relevant source files, a statement of the
404+additional terms that apply to those files, or a notice indicating
405+where to find the applicable terms.
406+
407+ Additional terms, permissive or non-permissive, may be stated in the
408+form of a separately written license, or stated as exceptions;
409+the above requirements apply either way.
410+
411+ 8. Termination.
412+
413+ You may not propagate or modify a covered work except as expressly
414+provided under this License. Any attempt otherwise to propagate or
415+modify it is void, and will automatically terminate your rights under
416+this License (including any patent licenses granted under the third
417+paragraph of section 11).
418+
419+ However, if you cease all violation of this License, then your
420+license from a particular copyright holder is reinstated (a)
421+provisionally, unless and until the copyright holder explicitly and
422+finally terminates your license, and (b) permanently, if the copyright
423+holder fails to notify you of the violation by some reasonable means
424+prior to 60 days after the cessation.
425+
426+ Moreover, your license from a particular copyright holder is
427+reinstated permanently if the copyright holder notifies you of the
428+violation by some reasonable means, this is the first time you have
429+received notice of violation of this License (for any work) from that
430+copyright holder, and you cure the violation prior to 30 days after
431+your receipt of the notice.
432+
433+ Termination of your rights under this section does not terminate the
434+licenses of parties who have received copies or rights from you under
435+this License. If your rights have been terminated and not permanently
436+reinstated, you do not qualify to receive new licenses for the same
437+material under section 10.
438+
439+ 9. Acceptance Not Required for Having Copies.
440+
441+ You are not required to accept this License in order to receive or
442+run a copy of the Program. Ancillary propagation of a covered work
443+occurring solely as a consequence of using peer-to-peer transmission
444+to receive a copy likewise does not require acceptance. However,
445+nothing other than this License grants you permission to propagate or
446+modify any covered work. These actions infringe copyright if you do
447+not accept this License. Therefore, by modifying or propagating a
448+covered work, you indicate your acceptance of this License to do so.
449+
450+ 10. Automatic Licensing of Downstream Recipients.
451+
452+ Each time you convey a covered work, the recipient automatically
453+receives a license from the original licensors, to run, modify and
454+propagate that work, subject to this License. You are not responsible
455+for enforcing compliance by third parties with this License.
456+
457+ An "entity transaction" is a transaction transferring control of an
458+organization, or substantially all assets of one, or subdividing an
459+organization, or merging organizations. If propagation of a covered
460+work results from an entity transaction, each party to that
461+transaction who receives a copy of the work also receives whatever
462+licenses to the work the party's predecessor in interest had or could
463+give under the previous paragraph, plus a right to possession of the
464+Corresponding Source of the work from the predecessor in interest, if
465+the predecessor has it or can get it with reasonable efforts.
466+
467+ You may not impose any further restrictions on the exercise of the
468+rights granted or affirmed under this License. For example, you may
469+not impose a license fee, royalty, or other charge for exercise of
470+rights granted under this License, and you may not initiate litigation
471+(including a cross-claim or counterclaim in a lawsuit) alleging that
472+any patent claim is infringed by making, using, selling, offering for
473+sale, or importing the Program or any portion of it.
474+
475+ 11. Patents.
476+
477+ A "contributor" is a copyright holder who authorizes use under this
478+License of the Program or a work on which the Program is based. The
479+work thus licensed is called the contributor's "contributor version".
480+
481+ A contributor's "essential patent claims" are all patent claims
482+owned or controlled by the contributor, whether already acquired or
483+hereafter acquired, that would be infringed by some manner, permitted
484+by this License, of making, using, or selling its contributor version,
485+but do not include claims that would be infringed only as a
486+consequence of further modification of the contributor version. For
487+purposes of this definition, "control" includes the right to grant
488+patent sublicenses in a manner consistent with the requirements of
489+this License.
490+
491+ Each contributor grants you a non-exclusive, worldwide, royalty-free
492+patent license under the contributor's essential patent claims, to
493+make, use, sell, offer for sale, import and otherwise run, modify and
494+propagate the contents of its contributor version.
495+
496+ In the following three paragraphs, a "patent license" is any express
497+agreement or commitment, however denominated, not to enforce a patent
498+(such as an express permission to practice a patent or covenant not to
499+sue for patent infringement). To "grant" such a patent license to a
500+party means to make such an agreement or commitment not to enforce a
501+patent against the party.
502+
503+ If you convey a covered work, knowingly relying on a patent license,
504+and the Corresponding Source of the work is not available for anyone
505+to copy, free of charge and under the terms of this License, through a
506+publicly available network server or other readily accessible means,
507+then you must either (1) cause the Corresponding Source to be so
508+available, or (2) arrange to deprive yourself of the benefit of the
509+patent license for this particular work, or (3) arrange, in a manner
510+consistent with the requirements of this License, to extend the patent
511+license to downstream recipients. "Knowingly relying" means you have
512+actual knowledge that, but for the patent license, your conveying the
513+covered work in a country, or your recipient's use of the covered work
514+in a country, would infringe one or more identifiable patents in that
515+country that you have reason to believe are valid.
516+
517+ If, pursuant to or in connection with a single transaction or
518+arrangement, you convey, or propagate by procuring conveyance of, a
519+covered work, and grant a patent license to some of the parties
520+receiving the covered work authorizing them to use, propagate, modify
521+or convey a specific copy of the covered work, then the patent license
522+you grant is automatically extended to all recipients of the covered
523+work and works based on it.
524+
525+ A patent license is "discriminatory" if it does not include within
526+the scope of its coverage, prohibits the exercise of, or is
527+conditioned on the non-exercise of one or more of the rights that are
528+specifically granted under this License. You may not convey a covered
529+work if you are a party to an arrangement with a third party that is
530+in the business of distributing software, under which you make payment
531+to the third party based on the extent of your activity of conveying
532+the work, and under which the third party grants, to any of the
533+parties who would receive the covered work from you, a discriminatory
534+patent license (a) in connection with copies of the covered work
535+conveyed by you (or copies made from those copies), or (b) primarily
536+for and in connection with specific products or compilations that
537+contain the covered work, unless you entered into that arrangement,
538+or that patent license was granted, prior to 28 March 2007.
539+
540+ Nothing in this License shall be construed as excluding or limiting
541+any implied license or other defenses to infringement that may
542+otherwise be available to you under applicable patent law.
543+
544+ 12. No Surrender of Others' Freedom.
545+
546+ If conditions are imposed on you (whether by court order, agreement or
547+otherwise) that contradict the conditions of this License, they do not
548+excuse you from the conditions of this License. If you cannot convey a
549+covered work so as to satisfy simultaneously your obligations under this
550+License and any other pertinent obligations, then as a consequence you may
551+not convey it at all. For example, if you agree to terms that obligate you
552+to collect a royalty for further conveying from those to whom you convey
553+the Program, the only way you could satisfy both those terms and this
554+License would be to refrain entirely from conveying the Program.
555+
556+ 13. Use with the GNU Affero General Public License.
557+
558+ Notwithstanding any other provision of this License, you have
559+permission to link or combine any covered work with a work licensed
560+under version 3 of the GNU Affero General Public License into a single
561+combined work, and to convey the resulting work. The terms of this
562+License will continue to apply to the part which is the covered work,
563+but the special requirements of the GNU Affero General Public License,
564+section 13, concerning interaction through a network will apply to the
565+combination as such.
566+
567+ 14. Revised Versions of this License.
568+
569+ The Free Software Foundation may publish revised and/or new versions of
570+the GNU General Public License from time to time. Such new versions will
571+be similar in spirit to the present version, but may differ in detail to
572+address new problems or concerns.
573+
574+ Each version is given a distinguishing version number. If the
575+Program specifies that a certain numbered version of the GNU General
576+Public License "or any later version" applies to it, you have the
577+option of following the terms and conditions either of that numbered
578+version or of any later version published by the Free Software
579+Foundation. If the Program does not specify a version number of the
580+GNU General Public License, you may choose any version ever published
581+by the Free Software Foundation.
582+
583+ If the Program specifies that a proxy can decide which future
584+versions of the GNU General Public License can be used, that proxy's
585+public statement of acceptance of a version permanently authorizes you
586+to choose that version for the Program.
587+
588+ Later license versions may give you additional or different
589+permissions. However, no additional obligations are imposed on any
590+author or copyright holder as a result of your choosing to follow a
591+later version.
592+
593+ 15. Disclaimer of Warranty.
594+
595+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
596+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
597+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
598+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
599+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
600+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
601+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
602+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
603+
604+ 16. Limitation of Liability.
605+
606+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
607+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
608+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
609+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
610+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
611+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
612+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
613+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
614+SUCH DAMAGES.
615+
616+ 17. Interpretation of Sections 15 and 16.
617+
618+ If the disclaimer of warranty and limitation of liability provided
619+above cannot be given local legal effect according to their terms,
620+reviewing courts shall apply local law that most closely approximates
621+an absolute waiver of all civil liability in connection with the
622+Program, unless a warranty or assumption of liability accompanies a
623+copy of the Program in return for a fee.
624+
625+ END OF TERMS AND CONDITIONS
626+
627+ How to Apply These Terms to Your New Programs
628+
629+ If you develop a new program, and you want it to be of the greatest
630+possible use to the public, the best way to achieve this is to make it
631+free software which everyone can redistribute and change under these terms.
632+
633+ To do so, attach the following notices to the program. It is safest
634+to attach them to the start of each source file to most effectively
635+state the exclusion of warranty; and each file should have at least
636+the "copyright" line and a pointer to where the full notice is found.
637+
638+ <one line to give the program's name and a brief idea of what it does.>
639+ Copyright (C) <year> <name of author>
640+
641+ This program is free software: you can redistribute it and/or modify
642+ it under the terms of the GNU General Public License as published by
643+ the Free Software Foundation, either version 3 of the License, or
644+ (at your option) any later version.
645+
646+ This program is distributed in the hope that it will be useful,
647+ but WITHOUT ANY WARRANTY; without even the implied warranty of
648+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
649+ GNU General Public License for more details.
650+
651+ You should have received a copy of the GNU General Public License
652+ along with this program. If not, see <http://www.gnu.org/licenses/>.
653+
654+Also add information on how to contact you by electronic and paper mail.
655+
656+ If the program does terminal interaction, make it output a short
657+notice like this when it starts in an interactive mode:
658+
659+ <program> Copyright (C) <year> <name of author>
660+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
661+ This is free software, and you are welcome to redistribute it
662+ under certain conditions; type `show c' for details.
663+
664+The hypothetical commands `show w' and `show c' should show the appropriate
665+parts of the General Public License. Of course, your program's commands
666+might be different; for a GUI interface, you would use an "about box".
667+
668+ You should also get your employer (if you work as a programmer) or school,
669+if any, to sign a "copyright disclaimer" for the program, if necessary.
670+For more information on this, and how to apply and follow the GNU GPL, see
671+<http://www.gnu.org/licenses/>.
672+
673+ The GNU General Public License does not permit incorporating your program
674+into proprietary programs. If your program is a subroutine library, you
675+may consider it more useful to permit linking proprietary applications with
676+the library. If this is what you want to do, use the GNU Lesser General
677+Public License instead of this License. But first, please read
678+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
679
680=== added file 'COPYING.LESSER'
681--- COPYING.LESSER 1970-01-01 00:00:00 +0000
682+++ COPYING.LESSER 2013-06-14 03:35:36 +0000
683@@ -0,0 +1,165 @@
684+ GNU LESSER GENERAL PUBLIC LICENSE
685+ Version 3, 29 June 2007
686+
687+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
688+ Everyone is permitted to copy and distribute verbatim copies
689+ of this license document, but changing it is not allowed.
690+
691+
692+ This version of the GNU Lesser General Public License incorporates
693+the terms and conditions of version 3 of the GNU General Public
694+License, supplemented by the additional permissions listed below.
695+
696+ 0. Additional Definitions.
697+
698+ As used herein, "this License" refers to version 3 of the GNU Lesser
699+General Public License, and the "GNU GPL" refers to version 3 of the GNU
700+General Public License.
701+
702+ "The Library" refers to a covered work governed by this License,
703+other than an Application or a Combined Work as defined below.
704+
705+ An "Application" is any work that makes use of an interface provided
706+by the Library, but which is not otherwise based on the Library.
707+Defining a subclass of a class defined by the Library is deemed a mode
708+of using an interface provided by the Library.
709+
710+ A "Combined Work" is a work produced by combining or linking an
711+Application with the Library. The particular version of the Library
712+with which the Combined Work was made is also called the "Linked
713+Version".
714+
715+ The "Minimal Corresponding Source" for a Combined Work means the
716+Corresponding Source for the Combined Work, excluding any source code
717+for portions of the Combined Work that, considered in isolation, are
718+based on the Application, and not on the Linked Version.
719+
720+ The "Corresponding Application Code" for a Combined Work means the
721+object code and/or source code for the Application, including any data
722+and utility programs needed for reproducing the Combined Work from the
723+Application, but excluding the System Libraries of the Combined Work.
724+
725+ 1. Exception to Section 3 of the GNU GPL.
726+
727+ You may convey a covered work under sections 3 and 4 of this License
728+without being bound by section 3 of the GNU GPL.
729+
730+ 2. Conveying Modified Versions.
731+
732+ If you modify a copy of the Library, and, in your modifications, a
733+facility refers to a function or data to be supplied by an Application
734+that uses the facility (other than as an argument passed when the
735+facility is invoked), then you may convey a copy of the modified
736+version:
737+
738+ a) under this License, provided that you make a good faith effort to
739+ ensure that, in the event an Application does not supply the
740+ function or data, the facility still operates, and performs
741+ whatever part of its purpose remains meaningful, or
742+
743+ b) under the GNU GPL, with none of the additional permissions of
744+ this License applicable to that copy.
745+
746+ 3. Object Code Incorporating Material from Library Header Files.
747+
748+ The object code form of an Application may incorporate material from
749+a header file that is part of the Library. You may convey such object
750+code under terms of your choice, provided that, if the incorporated
751+material is not limited to numerical parameters, data structure
752+layouts and accessors, or small macros, inline functions and templates
753+(ten or fewer lines in length), you do both of the following:
754+
755+ a) Give prominent notice with each copy of the object code that the
756+ Library is used in it and that the Library and its use are
757+ covered by this License.
758+
759+ b) Accompany the object code with a copy of the GNU GPL and this license
760+ document.
761+
762+ 4. Combined Works.
763+
764+ You may convey a Combined Work under terms of your choice that,
765+taken together, effectively do not restrict modification of the
766+portions of the Library contained in the Combined Work and reverse
767+engineering for debugging such modifications, if you also do each of
768+the following:
769+
770+ a) Give prominent notice with each copy of the Combined Work that
771+ the Library is used in it and that the Library and its use are
772+ covered by this License.
773+
774+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
775+ document.
776+
777+ c) For a Combined Work that displays copyright notices during
778+ execution, include the copyright notice for the Library among
779+ these notices, as well as a reference directing the user to the
780+ copies of the GNU GPL and this license document.
781+
782+ d) Do one of the following:
783+
784+ 0) Convey the Minimal Corresponding Source under the terms of this
785+ License, and the Corresponding Application Code in a form
786+ suitable for, and under terms that permit, the user to
787+ recombine or relink the Application with a modified version of
788+ the Linked Version to produce a modified Combined Work, in the
789+ manner specified by section 6 of the GNU GPL for conveying
790+ Corresponding Source.
791+
792+ 1) Use a suitable shared library mechanism for linking with the
793+ Library. A suitable mechanism is one that (a) uses at run time
794+ a copy of the Library already present on the user's computer
795+ system, and (b) will operate properly with a modified version
796+ of the Library that is interface-compatible with the Linked
797+ Version.
798+
799+ e) Provide Installation Information, but only if you would otherwise
800+ be required to provide such information under section 6 of the
801+ GNU GPL, and only to the extent that such information is
802+ necessary to install and execute a modified version of the
803+ Combined Work produced by recombining or relinking the
804+ Application with a modified version of the Linked Version. (If
805+ you use option 4d0, the Installation Information must accompany
806+ the Minimal Corresponding Source and Corresponding Application
807+ Code. If you use option 4d1, you must provide the Installation
808+ Information in the manner specified by section 6 of the GNU GPL
809+ for conveying Corresponding Source.)
810+
811+ 5. Combined Libraries.
812+
813+ You may place library facilities that are a work based on the
814+Library side by side in a single library together with other library
815+facilities that are not Applications and are not covered by this
816+License, and convey such a combined library under terms of your
817+choice, if you do both of the following:
818+
819+ a) Accompany the combined library with a copy of the same work based
820+ on the Library, uncombined with any other library facilities,
821+ conveyed under the terms of this License.
822+
823+ b) Give prominent notice with the combined library that part of it
824+ is a work based on the Library, and explaining where to find the
825+ accompanying uncombined form of the same work.
826+
827+ 6. Revised Versions of the GNU Lesser General Public License.
828+
829+ The Free Software Foundation may publish revised and/or new versions
830+of the GNU Lesser General Public License from time to time. Such new
831+versions will be similar in spirit to the present version, but may
832+differ in detail to address new problems or concerns.
833+
834+ Each version is given a distinguishing version number. If the
835+Library as you received it specifies that a certain numbered version
836+of the GNU Lesser General Public License "or any later version"
837+applies to it, you have the option of following the terms and
838+conditions either of that published version or of any later version
839+published by the Free Software Foundation. If the Library as you
840+received it does not specify a version number of the GNU Lesser
841+General Public License, you may choose any version of the GNU Lesser
842+General Public License ever published by the Free Software Foundation.
843+
844+ If the Library as you received it specifies that a proxy can decide
845+whether future versions of the GNU Lesser General Public License shall
846+apply, that proxy's public statement of acceptance of any version is
847+permanent authorization for you to choose that version for the
848+Library.
849
850=== added file 'LICENSE'
851--- LICENSE 1970-01-01 00:00:00 +0000
852+++ LICENSE 2013-06-14 03:35:36 +0000
853@@ -0,0 +1,15 @@
854+golxc - Go package to interact with Linux Containers (LXC).
855+
856+Copyright 2012-2013, Canonical Ltd.
857+
858+This program is free software: you can redistribute it and/or modify it under
859+the terms of the GNU Lesser General Public License as published by the Free
860+Software Foundation, either version 3 of the License, or (at your option) any
861+later version.
862+
863+This program is distributed in the hope that it will be useful, but WITHOUT ANY
864+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
865+PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
866+
867+See both COPYING and COPYING.LESSER for the full terms of the GNU Lesser
868+General Public License.
869
870=== modified file 'config.go'
871--- config.go 2013-02-07 11:38:22 +0000
872+++ config.go 2013-06-14 03:35:36 +0000
873@@ -1,3 +1,6 @@
874+// Copyright 2012, 2013 Canonical Ltd.
875+// Licensed under the LGPLv3, see COPYING and COPYING.LESSER file for details.
876+
877 package golxc
878
879 import (
880
881=== modified file 'export_test.go'
882--- export_test.go 2013-02-05 12:47:21 +0000
883+++ export_test.go 2013-06-14 03:35:36 +0000
884@@ -1,8 +1,11 @@
885+// Copyright 2012, 2013 Canonical Ltd.
886+// Licensed under the LGPLv3, see COPYING and COPYING.LESSER file for details.
887+
888 package golxc
889
890 // ContainerHome returns the name of the container directory.
891-func ContainerHome(c *Container) string {
892- return c.containerHome()
893+func ContainerHome(c Container) string {
894+ return c.(*container).containerHome()
895 }
896
897 // SetConfPath allows the manipulation of the LXC
898
899=== modified file 'golxc.go'
900--- golxc.go 2013-02-07 13:53:53 +0000
901+++ golxc.go 2013-06-14 03:35:36 +0000
902@@ -1,11 +1,10 @@
903-//
904+// Copyright 2012, 2013 Canonical Ltd.
905+// Licensed under the LGPLv3, see COPYING and COPYING.LESSER file for details.
906+
907 // golxc - Go package to interact with Linux Containers (LXC).
908 //
909 // https://launchpad.net/golxc/
910 //
911-// Copyright (c) 2012 Canonical Ltd.
912-//
913-
914 package golxc
915
916 import (
917@@ -59,52 +58,141 @@
918 )
919
920 // Container represents a linux container instance and provides
921-// operations to create, maintain and destroy the container.
922-type Container struct {
923+// operations to create, maintain and destroy the container.
924+type Container interface {
925+
926+ // Name returns the name of the container.
927+ Name() string
928+
929+ // Create creates a new container based on the given template.
930+ Create(configFile, template string, templateArgs ...string) error
931+
932+ // Start runs the container as a daemon.
933+ Start(configFile, consoleFile string) error
934+
935+ // Stop terminates the running container.
936+ Stop() error
937+
938+ // Clone creates a copy of the container, giving the copy the specified name.
939+ Clone(name string) (Container, error)
940+
941+ // Freeze freezes all the container's processes.
942+ Freeze() error
943+
944+ // Unfreeze thaws all frozen container's processes.
945+ Unfreeze() error
946+
947+ // Destroy stops and removes the container.
948+ Destroy() error
949+
950+ // Wait waits for one of the specified container states.
951+ Wait(states ...State) error
952+
953+ // Info returns the status and the process id of the container.
954+ Info() (State, int, error)
955+
956+ // IsConstructed checks if the container image exists.
957+ IsConstructed() bool
958+
959+ // IsRunning checks if the state of the container is 'RUNNING'.
960+ IsRunning() bool
961+
962+ // String returns information about the container, like the name, state,
963+ // and process id.
964+ String() string
965+
966+ // LogFile returns the current filename used for the LogFile.
967+ LogFile() string
968+
969+ // LogLevel returns the current logging level (only used if the
970+ // LogFile is not "").
971+ LogLevel() LogLevel
972+
973+ // SetLogFile sets both the LogFile and LogLevel.
974+ SetLogFile(filename string, level LogLevel)
975+}
976+
977+// ContainerFactory represents the methods used to create Containers.
978+type ContainerFactory interface {
979+ // New returns a container instance which can then be used for operations
980+ // like Create(), Start(), Stop() or Destroy().
981+ New(string) Container
982+
983+ // List returns all the existing containers on the system.
984+ List() ([]Container, error)
985+}
986+
987+// Factory provides the standard ContainerFactory.
988+func Factory() ContainerFactory {
989+ return &containerFactory{}
990+}
991+
992+type container struct {
993 name string
994- LogFile string
995- LogLevel LogLevel
996+ logFile string
997+ logLevel LogLevel
998 }
999
1000-// New returns a container instance which can then be used for operations
1001-// like Create(), Start(), Stop() or Destroy().
1002-func New(name string) *Container {
1003- return &Container{
1004- name: name,
1005+type containerFactory struct{}
1006+
1007+func (*containerFactory) New(name string) Container {
1008+ return &container{
1009+ name: name,
1010+ logLevel: LogWarning,
1011 }
1012 }
1013
1014-// List lists the existing containers on the system.
1015-func List() ([]*Container, error) {
1016+// List returns all the existing containers on the system.
1017+func (factory *containerFactory) List() ([]Container, error) {
1018 out, err := run("lxc-ls", "-1")
1019 if err != nil {
1020 return nil, err
1021 }
1022 names := nameSet(out)
1023- containers := make([]*Container, len(names))
1024+ containers := make([]Container, len(names))
1025 for i, name := range names {
1026- containers[i] = New(name)
1027+ containers[i] = factory.New(name)
1028 }
1029 return containers, nil
1030 }
1031
1032 // Name returns the name of the container.
1033-func (c *Container) Name() string {
1034+func (c *container) Name() string {
1035 return c.name
1036 }
1037
1038+// LogFile returns the current filename used for the LogFile.
1039+func (c *container) LogFile() string {
1040+ return c.logFile
1041+}
1042+
1043+// LogLevel returns the current logging level, this is only used if the
1044+// LogFile is not "".
1045+func (c *container) LogLevel() LogLevel {
1046+ return c.logLevel
1047+}
1048+
1049+// SetLogFile sets both the LogFile and LogLevel.
1050+func (c *container) SetLogFile(filename string, level LogLevel) {
1051+ c.logFile = filename
1052+ c.logLevel = level
1053+}
1054+
1055 // Create creates a new container based on the given template.
1056-func (c *Container) Create(template string, tmplArgs ...string) error {
1057+func (c *container) Create(configFile, template string, templateArgs ...string) error {
1058 if c.IsConstructed() {
1059 return fmt.Errorf("container %q is already created", c.Name())
1060 }
1061 args := []string{
1062 "-n", c.name,
1063 "-t", template,
1064- "--",
1065- }
1066- if len(tmplArgs) != 0 {
1067- args = append(args, tmplArgs...)
1068+ }
1069+ if configFile != "" {
1070+ args = append(args, "-f", configFile)
1071+ }
1072+ args = append(args, "--")
1073+ if len(templateArgs) != 0 {
1074+ args = append(args, templateArgs...)
1075 }
1076 _, err := run("lxc-create", args...)
1077 if err != nil {
1078@@ -114,7 +202,7 @@
1079 }
1080
1081 // Start runs the container as a daemon.
1082-func (c *Container) Start(configFile, consoleFile string) error {
1083+func (c *container) Start(configFile, consoleFile string) error {
1084 if !c.IsConstructed() {
1085 return fmt.Errorf("container %q is not yet created", c.name)
1086 }
1087@@ -128,8 +216,8 @@
1088 if consoleFile != "" {
1089 args = append(args, "-c", consoleFile)
1090 }
1091- if c.LogFile != "" {
1092- args = append(args, "-o", c.LogFile, "-l", string(c.LogLevel))
1093+ if c.logFile != "" {
1094+ args = append(args, "-o", c.logFile, "-l", string(c.logLevel))
1095 }
1096 _, err := run("lxc-start", args...)
1097 if err != nil {
1098@@ -139,15 +227,15 @@
1099 }
1100
1101 // Stop terminates the running container.
1102-func (c *Container) Stop() error {
1103+func (c *container) Stop() error {
1104 if !c.IsConstructed() {
1105 return fmt.Errorf("container %q is not yet created", c.name)
1106 }
1107 args := []string{
1108 "-n", c.name,
1109 }
1110- if c.LogFile != "" {
1111- args = append(args, "-o", c.LogFile, "-l", string(c.LogLevel))
1112+ if c.logFile != "" {
1113+ args = append(args, "-o", c.logFile, "-l", string(c.logLevel))
1114 }
1115 _, err := run("lxc-stop", args...)
1116 if err != nil {
1117@@ -157,11 +245,11 @@
1118 }
1119
1120 // Clone creates a copy of the container, it gets the given name.
1121-func (c *Container) Clone(name string) (*Container, error) {
1122+func (c *container) Clone(name string) (Container, error) {
1123 if !c.IsConstructed() {
1124 return nil, fmt.Errorf("container %q is not yet created", c.name)
1125 }
1126- cc := &Container{
1127+ cc := &container{
1128 name: name,
1129 }
1130 if cc.IsConstructed() {
1131@@ -179,7 +267,7 @@
1132 }
1133
1134 // Freeze freezes all the container's processes.
1135-func (c *Container) Freeze() error {
1136+func (c *container) Freeze() error {
1137 if !c.IsConstructed() {
1138 return fmt.Errorf("container %q is not yet created", c.name)
1139 }
1140@@ -189,8 +277,8 @@
1141 args := []string{
1142 "-n", c.name,
1143 }
1144- if c.LogFile != "" {
1145- args = append(args, "-o", c.LogFile, "-l", string(c.LogLevel))
1146+ if c.logFile != "" {
1147+ args = append(args, "-o", c.logFile, "-l", string(c.logLevel))
1148 }
1149 _, err := run("lxc-freeze", args...)
1150 if err != nil {
1151@@ -200,7 +288,7 @@
1152 }
1153
1154 // Unfreeze thaws all frozen container's processes.
1155-func (c *Container) Unfreeze() error {
1156+func (c *container) Unfreeze() error {
1157 if !c.IsConstructed() {
1158 return fmt.Errorf("container %q is not yet created", c.name)
1159 }
1160@@ -210,8 +298,8 @@
1161 args := []string{
1162 "-n", c.name,
1163 }
1164- if c.LogFile != "" {
1165- args = append(args, "-o", c.LogFile, "-l", string(c.LogLevel))
1166+ if c.logFile != "" {
1167+ args = append(args, "-o", c.logFile, "-l", string(c.logLevel))
1168 }
1169 _, err := run("lxc-unfreeze", args...)
1170 if err != nil {
1171@@ -221,7 +309,7 @@
1172 }
1173
1174 // Destroy stops and removes the container.
1175-func (c *Container) Destroy() error {
1176+func (c *container) Destroy() error {
1177 if !c.IsConstructed() {
1178 return fmt.Errorf("container %q is not yet created", c.name)
1179 }
1180@@ -236,7 +324,7 @@
1181 }
1182
1183 // Wait waits for one of the specified container states.
1184-func (c *Container) Wait(states ...State) error {
1185+func (c *container) Wait(states ...State) error {
1186 if len(states) == 0 {
1187 return fmt.Errorf("no states specified")
1188 }
1189@@ -253,7 +341,7 @@
1190 }
1191
1192 // Info returns the status and the process id of the container.
1193-func (c *Container) Info() (State, int, error) {
1194+func (c *container) Info() (State, int, error) {
1195 out, err := run("lxc-info", "-n", c.name)
1196 if err != nil {
1197 return StateUnknown, -1, err
1198@@ -268,7 +356,7 @@
1199 }
1200
1201 // IsConstructed checks if the container image exists.
1202-func (c *Container) IsConstructed() bool {
1203+func (c *container) IsConstructed() bool {
1204 fi, err := os.Stat(c.rootfs())
1205 if err != nil {
1206 return false
1207@@ -277,7 +365,7 @@
1208 }
1209
1210 // IsRunning checks if the state of the container is 'RUNNING'.
1211-func (c *Container) IsRunning() bool {
1212+func (c *container) IsRunning() bool {
1213 state, _, err := c.Info()
1214 if err != nil {
1215 return false
1216@@ -286,7 +374,7 @@
1217 }
1218
1219 // String returns information about the container.
1220-func (c *Container) String() string {
1221+func (c *container) String() string {
1222 state, pid, err := c.Info()
1223 if err != nil {
1224 return fmt.Sprintf("cannot retrieve container info for %q: %v", c.name, err)
1225@@ -295,13 +383,13 @@
1226 }
1227
1228 // containerHome returns the name of the container directory.
1229-func (c *Container) containerHome() string {
1230+func (c *container) containerHome() string {
1231 return "/var/lib/lxc/" + c.name
1232 }
1233
1234 // rootfs returns the name of the directory containing the
1235 // root filesystem of the container.
1236-func (c *Container) rootfs() string {
1237+func (c *container) rootfs() string {
1238 return c.containerHome() + "/rootfs/"
1239 }
1240
1241
1242=== modified file 'golxc_test.go'
1243--- golxc_test.go 2013-02-07 13:53:53 +0000
1244+++ golxc_test.go 2013-06-14 03:35:36 +0000
1245@@ -124,9 +124,11 @@
1246 c.Assert(err, ErrorMatches, "open .*: no such file or directory")
1247 }
1248
1249-type LXCSuite struct{}
1250+type LXCSuite struct {
1251+ factory golxc.ContainerFactory
1252+}
1253
1254-var _ = Suite(&LXCSuite{})
1255+var _ = Suite(&LXCSuite{golxc.Factory()})
1256
1257 func (s *LXCSuite) SetUpSuite(c *C) {
1258 u, err := user.Current()
1259@@ -139,12 +141,12 @@
1260
1261 func (s *LXCSuite) TestCreateDestroy(c *C) {
1262 // Test clean creation and destroying of a container.
1263- lc := golxc.New("golxc")
1264+ lc := s.factory.New("golxc")
1265 c.Assert(lc.IsConstructed(), Equals, false)
1266 home := golxc.ContainerHome(lc)
1267 _, err := os.Stat(home)
1268 c.Assert(err, ErrorMatches, "stat .*: no such file or directory")
1269- err = lc.Create("ubuntu")
1270+ err = lc.Create("", "ubuntu")
1271 c.Assert(err, IsNil)
1272 c.Assert(lc.IsConstructed(), Equals, true)
1273 defer func() {
1274@@ -160,38 +162,38 @@
1275
1276 func (s *LXCSuite) TestCreateTwice(c *C) {
1277 // Test that a container cannot be created twice.
1278- lc1 := golxc.New("golxc")
1279+ lc1 := s.factory.New("golxc")
1280 c.Assert(lc1.IsConstructed(), Equals, false)
1281- err := lc1.Create("ubuntu")
1282+ err := lc1.Create("", "ubuntu")
1283 c.Assert(err, IsNil)
1284 c.Assert(lc1.IsConstructed(), Equals, true)
1285 defer func() {
1286 c.Assert(lc1.Destroy(), IsNil)
1287 }()
1288- lc2 := golxc.New("golxc")
1289- err = lc2.Create("ubuntu")
1290+ lc2 := s.factory.New("golxc")
1291+ err = lc2.Create("", "ubuntu")
1292 c.Assert(err, ErrorMatches, "container .* is already created")
1293 }
1294
1295 func (s *LXCSuite) TestCreateIllegalTemplate(c *C) {
1296 // Test that a container creation fails correctly in
1297 // case of an illegal template.
1298- lc := golxc.New("golxc")
1299+ lc := s.factory.New("golxc")
1300 c.Assert(lc.IsConstructed(), Equals, false)
1301- err := lc.Create("name-of-a-not-existing-template-for-golxc")
1302+ err := lc.Create("", "name-of-a-not-existing-template-for-golxc")
1303 c.Assert(err, ErrorMatches, `error executing "lxc-create": No config file specified, .*`)
1304 c.Assert(lc.IsConstructed(), Equals, false)
1305 }
1306
1307-func (l *LXCSuite) TestDestroyNotCreated(c *C) {
1308+func (s *LXCSuite) TestDestroyNotCreated(c *C) {
1309 // Test that a non-existing container can't be destroyed.
1310- lc := golxc.New("golxc")
1311+ lc := s.factory.New("golxc")
1312 c.Assert(lc.IsConstructed(), Equals, false)
1313 err := lc.Destroy()
1314 c.Assert(err, ErrorMatches, "container .* is not yet created")
1315 }
1316
1317-func contains(lcs []*golxc.Container, lc *golxc.Container) bool {
1318+func contains(lcs []golxc.Container, lc golxc.Container) bool {
1319 for _, clc := range lcs {
1320 if clc.Name() == lc.Name() {
1321 return true
1322@@ -202,18 +204,18 @@
1323
1324 func (s *LXCSuite) TestList(c *C) {
1325 // Test the listing of created containers.
1326- lcs, err := golxc.List()
1327+ lcs, err := s.factory.List()
1328 oldLen := len(lcs)
1329 c.Assert(err, IsNil)
1330 c.Assert(oldLen >= 0, Equals, true)
1331- lc := golxc.New("golxc")
1332+ lc := s.factory.New("golxc")
1333 c.Assert(lc.IsConstructed(), Equals, false)
1334- c.Assert(lc.Create("ubuntu"), IsNil)
1335+ c.Assert(lc.Create("", "ubuntu"), IsNil)
1336 c.Assert(lc.IsConstructed(), Equals, true)
1337 defer func() {
1338 c.Assert(lc.Destroy(), IsNil)
1339 }()
1340- lcs, _ = golxc.List()
1341+ lcs, _ = s.factory.List()
1342 newLen := len(lcs)
1343 c.Assert(newLen == oldLen+1, Equals, true)
1344 c.Assert(contains(lcs, lc), Equals, true)
1345@@ -221,14 +223,14 @@
1346
1347 func (s *LXCSuite) TestClone(c *C) {
1348 // Test the cloning of an existing container.
1349- lc1 := golxc.New("golxc")
1350+ lc1 := s.factory.New("golxc")
1351 c.Assert(lc1.IsConstructed(), Equals, false)
1352- c.Assert(lc1.Create("ubuntu"), IsNil)
1353+ c.Assert(lc1.Create("", "ubuntu"), IsNil)
1354 c.Assert(lc1.IsConstructed(), Equals, true)
1355 defer func() {
1356 c.Assert(lc1.Destroy(), IsNil)
1357 }()
1358- lcs, _ := golxc.List()
1359+ lcs, _ := s.factory.List()
1360 oldLen := len(lcs)
1361 lc2, err := lc1.Clone("golxcclone")
1362 c.Assert(err, IsNil)
1363@@ -236,7 +238,7 @@
1364 defer func() {
1365 c.Assert(lc2.Destroy(), IsNil)
1366 }()
1367- lcs, _ = golxc.List()
1368+ lcs, _ = s.factory.List()
1369 newLen := len(lcs)
1370 c.Assert(newLen == oldLen+1, Equals, true)
1371 c.Assert(contains(lcs, lc1), Equals, true)
1372@@ -245,7 +247,7 @@
1373
1374 func (s *LXCSuite) TestCloneNotCreated(c *C) {
1375 // Test the cloning of a non-existing container.
1376- lc := golxc.New("golxc")
1377+ lc := s.factory.New("golxc")
1378 c.Assert(lc.IsConstructed(), Equals, false)
1379 _, err := lc.Clone("golxcclone")
1380 c.Assert(err, ErrorMatches, "container .* is not yet created")
1381@@ -253,9 +255,9 @@
1382
1383 func (s *LXCSuite) TestStartStop(c *C) {
1384 // Test starting and stopping a container.
1385- lc := golxc.New("golxc")
1386+ lc := s.factory.New("golxc")
1387 c.Assert(lc.IsConstructed(), Equals, false)
1388- c.Assert(lc.Create("ubuntu"), IsNil)
1389+ c.Assert(lc.Create("", "ubuntu"), IsNil)
1390 defer func() {
1391 c.Assert(lc.Destroy(), IsNil)
1392 }()
1393@@ -265,18 +267,18 @@
1394 c.Assert(lc.IsRunning(), Equals, false)
1395 }
1396
1397-func (l *LXCSuite) TestStartNotCreated(c *C) {
1398+func (s *LXCSuite) TestStartNotCreated(c *C) {
1399 // Test that a non-existing container can't be started.
1400- lc := golxc.New("golxc")
1401+ lc := s.factory.New("golxc")
1402 c.Assert(lc.IsConstructed(), Equals, false)
1403 c.Assert(lc.Start("", ""), ErrorMatches, "container .* is not yet created")
1404 }
1405
1406-func (l *LXCSuite) TestStopNotRunning(c *C) {
1407+func (s *LXCSuite) TestStopNotRunning(c *C) {
1408 // Test that a not running container can't be stopped.
1409- lc := golxc.New("golxc")
1410+ lc := s.factory.New("golxc")
1411 c.Assert(lc.IsConstructed(), Equals, false)
1412- c.Assert(lc.Create("ubuntu"), IsNil)
1413+ c.Assert(lc.Create("", "ubuntu"), IsNil)
1414 defer func() {
1415 c.Assert(lc.Destroy(), IsNil)
1416 }()
1417@@ -286,12 +288,12 @@
1418 func (s *LXCSuite) TestWait(c *C) {
1419 // Test waiting for one of a number of states of a container.
1420 // ATTN: Using a not reached state blocks the test until timeout!
1421- lc := golxc.New("golxc")
1422+ lc := s.factory.New("golxc")
1423 c.Assert(lc.IsConstructed(), Equals, false)
1424 c.Assert(lc.Wait(), ErrorMatches, "no states specified")
1425 c.Assert(lc.Wait(golxc.StateStopped), IsNil)
1426 c.Assert(lc.Wait(golxc.StateStopped, golxc.StateRunning), IsNil)
1427- c.Assert(lc.Create("ubuntu"), IsNil)
1428+ c.Assert(lc.Create("", "ubuntu"), IsNil)
1429 defer func() {
1430 c.Assert(lc.Destroy(), IsNil)
1431 }()
1432@@ -301,11 +303,11 @@
1433 c.Assert(lc.Wait(golxc.StateRunning), IsNil)
1434 }
1435
1436-func (l *LXCSuite) TestFreezeUnfreeze(c *C) {
1437+func (s *LXCSuite) TestFreezeUnfreeze(c *C) {
1438 // Test the freezing and unfreezing of a started container.
1439- lc := golxc.New("golxc")
1440+ lc := s.factory.New("golxc")
1441 c.Assert(lc.IsConstructed(), Equals, false)
1442- c.Assert(lc.Create("ubuntu"), IsNil)
1443+ c.Assert(lc.Create("", "ubuntu"), IsNil)
1444 defer func() {
1445 c.Assert(lc.Destroy(), IsNil)
1446 }()
1447@@ -320,36 +322,36 @@
1448 c.Assert(lc.IsRunning(), Equals, true)
1449 }
1450
1451-func (l *LXCSuite) TestFreezeNotStarted(c *C) {
1452+func (s *LXCSuite) TestFreezeNotStarted(c *C) {
1453 // Test that a not running container can't be frozen.
1454- lc := golxc.New("golxc")
1455+ lc := s.factory.New("golxc")
1456 c.Assert(lc.IsConstructed(), Equals, false)
1457- c.Assert(lc.Create("ubuntu"), IsNil)
1458+ c.Assert(lc.Create("", "ubuntu"), IsNil)
1459 defer func() {
1460 c.Assert(lc.Destroy(), IsNil)
1461 }()
1462 c.Assert(lc.Freeze(), ErrorMatches, "container .* is not running")
1463 }
1464
1465-func (l *LXCSuite) TestFreezeNotCreated(c *C) {
1466+func (s *LXCSuite) TestFreezeNotCreated(c *C) {
1467 // Test that a non-existing container can't be frozen.
1468- lc := golxc.New("golxc")
1469+ lc := s.factory.New("golxc")
1470 c.Assert(lc.IsConstructed(), Equals, false)
1471 c.Assert(lc.Freeze(), ErrorMatches, "container .* is not yet created")
1472 }
1473
1474-func (l *LXCSuite) TestUnfreezeNotCreated(c *C) {
1475+func (s *LXCSuite) TestUnfreezeNotCreated(c *C) {
1476 // Test that a non-existing container can't be unfrozen.
1477- lc := golxc.New("golxc")
1478+ lc := s.factory.New("golxc")
1479 c.Assert(lc.IsConstructed(), Equals, false)
1480 c.Assert(lc.Unfreeze(), ErrorMatches, "container .* is not yet created")
1481 }
1482
1483-func (l *LXCSuite) TestUnfreezeNotFrozen(c *C) {
1484+func (s *LXCSuite) TestUnfreezeNotFrozen(c *C) {
1485 // Test that a running container can't be unfrozen.
1486- lc := golxc.New("golxc")
1487+ lc := s.factory.New("golxc")
1488 c.Assert(lc.IsConstructed(), Equals, false)
1489- c.Assert(lc.Create("ubuntu"), IsNil)
1490+ c.Assert(lc.Create("", "ubuntu"), IsNil)
1491 defer func() {
1492 c.Assert(lc.Destroy(), IsNil)
1493 }()
1494
1495=== modified file 'network.go'
1496--- network.go 2013-02-07 13:53:53 +0000
1497+++ network.go 2013-06-14 03:35:36 +0000
1498@@ -1,3 +1,6 @@
1499+// Copyright 2012, 2013 Canonical Ltd.
1500+// Licensed under the LGPLv3, see COPYING and COPYING.LESSER file for details.
1501+
1502 package golxc
1503
1504 import (

Subscribers

People subscribed via source and target branches

to all changes: