|
[-]
[+]
|
Changed |
opennebula-driver-vmware.changes
|
|
|
|
[-]
[+]
|
Changed |
opennebula-driver-vmware.spec
^
|
|
|
|
[-]
[+]
|
Changed |
vmware-install.patch
^
|
| @@ -1,26 +1,13 @@
---- install.sh.orig 2011-06-27 20:43:22.488432936 +0200
-+++ install.sh 2011-06-27 20:45:25.504233430 +0200
-@@ -81,18 +81,18 @@
+--- install.sh.orig 2011-10-16 19:27:42.194243029 +0200
++++ install.sh 2011-10-16 19:28:56.410900936 +0200
+@@ -83,8 +83,8 @@
+ cp $DIR/tm/etc/tm_vmware.conf $DESTDIR$ETC_LOCATION/tm_vmware || error=true
cp $DIR/tm/commands/* $DESTDIR$LIB_LOCATION/tm_commands/vmware || error=true
- # Make changes to image hook
--LAST_HOOK_LINE=`tail -1 $DESTDIR$SHARE_LOCATION/hooks/image.rb`
-+LAST_HOOK_LINE=`tail -1 $SHARE_LOCATION/hooks/image.rb`
- LAST_ADDITION_LINE=`tail -1 $DIR/share/image.rb.addition`
-
- if [ "x$LAST_HOOK_LINE" != "x$LAST_ADDITION_LINE" ]; then
- cat $DIR/share/image.rb.addition >> $DESTDIR$SHARE_LOCATION/hooks/image.rb || error=true
- fi
-
--if [ ! -e $HOME/.one/addons ]; then
-- mkdir $HOME/.one/addons || error
--fi
-+#if [ ! -e $HOME/.one/addons ]; then
-+# mkdir $HOME/.one/addons || error
-+#fi
-
--echo "2.2.0" > $HOME/.one/addons/vmware || error
-+#echo "2.2.0" > $HOME/.one/addons/vmware || error
+-mkdir -p $ADDON_DIR/.one/addons/vmware &> /dev/null
+-echo "$VERSION" > $ADDON_DIR/.one/addons/vmware/version &> /dev/null
++#mkdir -p $ADDON_DIR/.one/addons/vmware &> /dev/null
++#echo "$VERSION" > $ADDON_DIR/.one/addons/vmware/version &> /dev/null
# Report error or success
if [ -n "$error" ]; then
|
|
[-]
[+]
|
Deleted |
vmware-2.2.0.tar.bz2/COPYING
^
|
| @@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
|
[-]
[+]
|
Deleted |
vmware-2.2.0.tar.bz2/README
^
|
| @@ -1,41 +0,0 @@
-
- OpenNebula VMware Driver Addon
-
- This is the distribution of OpenNebula VMware Driver Addon.
-
- This program is free software. You may redistribute it and/or
- modify it under the terms of:
-
- The GNU General Public License, as published by the Free
- Software Foundation; either version 3, or (at your option) any
- later version. A copy of this license is in the file COPYING.
-
- Please report any problems to contact@c12g.com.
-
-=========================================================================
-
-The OpenNebula Addons are extensions of OpenNebula that are ready to be
-used in production environments, having followed the same testing and
-quality procedures that OpenNebula, and are released under a different
-OSI-compliant license. The OpenNebula project does endorse these
-extensions providing support through the user mailing list.
-
-VMware Driver Addon
-
-=========================================================================
-
-INSTALLATION
-
-1. Follow these instructions as the OpenNebula user administrator.
-
-2. Prepare the environment for the execution of OpenNebula i.e. export
- ONE_AUTH, ONE_XMLRPC, set the PATH to include OpenNebula's "bin"
- directory. If you are using OpenNebula in self-contained mode you will
- also need to export ONE_LOCATION.
-
-3. Move the distributed source to its own directory, unpack it, and change
- to the extracted directory.
-
-4. Execute "./install.sh".
- This will copy all the files to their proper locations and report
- if the installation was successful or not.
|
|
[-]
[+]
|
Deleted |
vmware-2.2.0.tar.bz2/lib/ImageRepositoryVMware.rb
^
|
| @@ -1,83 +0,0 @@
-# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
-#
-# This file is part of OpenNebula VMware Drivers.
-#
-# OpenNebula VMware Drivers is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or the hope That it will be useful, but (at your
-# option) any later version.
-#
-# OpenNebula VMware Drivers is distributed in WITHOUT ANY WARRANTY;
-# without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenNebula VMware Drivers . If not, see
-# <http://www.gnu.org/licenses/>
-# --------------------------------------------------------------------------
-
-require 'OpenNebula/Image'
-require 'fileutils'
-
-module OpenNebula
- class ImageRepositoryVMware < ImageRepository
-
- def create_vmware(image, template, vmdk_path, flat_path)
- if image.nil?
- error_msg = "Image could not be found, aborting."
- return OpenNebula::Error.new(error_msg)
- end
-
- # ------ Check file existence ----
- if !File.exists?(vmdk_path)
- error_msg = "Disk image file could not be found, aborting."
- return OpenNebula::Error.new(error_msg)
- end
-
- flat_path = flat_path.split(",")
-
- flat_path.each{ |flat_file|
- if !File.exists?(flat_file)
- error_msg = "Flat image file could not be found, aborting."
- return OpenNebula::Error.new(error_msg)
- end
- }
-
- # ------ Allocate the Image ------
- result = image.allocate(template)
-
- if OpenNebula.is_error?(result)
- return result
- end
-
- # ------ Copy the Image file ------
- image.info
-
- Dir.mkdir(image['SOURCE'])
-
- result = copy(vmdk_path, image['SOURCE']+"/disk.vmdk")
- if !OpenNebula.is_error?(result)
- flat_path.each{|flat_file|
- result = copy(flat_file,
- image['SOURCE']+"/"+File.basename(flat_file))
- }
-
- if OpenNebula.is_error?(result)
- remove(image['SOURCE']+"/disk.vmdk")
- end
- end
-
- # ------ Enable the Image ------
- if !OpenNebula.is_error?(result)
- image.enable
- else
- image.delete
- end
-
- return result
- end
- end
-end
\ No newline at end of file
|
|
[-]
[+]
|
Deleted |
vmware-2.2.0.tar.bz2/lib/onevmware
^
|
| @@ -1,134 +0,0 @@
-#!/usr/bin/env ruby
-
-# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
-#
-# This file is part of OpenNebula VMware Drivers.
-#
-# OpenNebula VMware Drivers is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or the hope That it will be useful, but (at your
-# option) any later version.
-#
-# OpenNebula VMware Drivers is distributed in WITHOUT ANY WARRANTY;
-# without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenNebula VMware Drivers . If not, see
-# <http://www.gnu.org/licenses/>
-# --------------------------------------------------------------------------
-
-ONE_LOCATION=ENV["ONE_LOCATION"]
-
-if !ONE_LOCATION
- RUBY_LIB_LOCATION="/usr/lib/one/ruby"
-else
- RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
-end
-
-$: << RUBY_LIB_LOCATION
-
-
-require 'OpenNebula'
-require 'OpenNebula/ImageRepositoryVMware'
-require 'CommandManager'
-require 'client_utilities'
-require 'command_parse'
-
-##########################
-## COMMAND LINE PARSING ##
-##########################
-
-class OneVMwareParse < CommandParse
-
- COMMANDS_HELP=<<-EOT
-Commands:
-
-* register (Registers an image, copying it to the repository if it applies)
- onevmware register --disk-vmdk <path> --disk-flat <path1,path2,.> <tmplt>
-
- tmplt is a template filename where the Image description is located
-EOT
-
- def text_commands
- COMMANDS_HELP
- end
-
- def text_command_name
- "onevmware"
- end
-
- def list_options
- table=ShowTable.new(ShowTableImage)
- table.print_help
- end
-
- def special_options(opts, options)
- opts.on_tail("-k path", "--disk-vmdk path", String, "Path to vmdk "<<
- "descriptor file") do |o|
- options[:vmdk]=o
- end
- opts.on_tail("-f path", "--disk-flat path", String, "Path to flat "<<
- "vmdk disk file(s), separated by commas.") do |o|
- options[:flat]=o
- end
- end
-end
-
-
-def get_template(template_path)
- begin
- template = File.read(ARGV[0])
- rescue
- result = OpenNebula::Error.new("Can not read template: #{ARGV[0]}")
- end
-
- if !is_successful?(result)
- puts result.message
- exit -1
- end
-
- return template
-end
-
-onevmware_opts=OneVMwareParse.new([])
-onevmware_opts.parse(ARGV)
-ops=onevmware_opts.options
-
-result=[false, "Unknown error"]
-
-command=ARGV.shift
-
-img_repo = OpenNebula::ImageRepositoryVMware.new
-
-case command
-when "register", "create", "add"
- check_parameters("register", 1)
- template = get_template(ARGV[0])
-
- image = OpenNebula::Image.new(OpenNebula::Image.build_xml, get_one_client)
-
- if ops[:vmdk] and ops[:flat]
- result = img_repo.create_vmware(image, template, ops[:vmdk], ops[:flat])
- else
- result = OpenNebula::Error.new("Files not found.")
- end
-
- if is_successful?(result)
- puts "ID: " + image.id.to_s if ops[:verbose]
- end
-
-else
- onevmware_opts.print_help
- exit -1
-end
-
-if OpenNebula.is_error?(result)
- puts "Error: " + result.message
- exit -1
-end
-
-
|
|
[-]
[+]
|
Deleted |
vmware-2.2.0.tar.bz2/share/image.rb.addition
^
|
| @@ -1,7 +0,0 @@
-if !ONE_LOCATION
- SHARE_LOCATION="/usr/share/one"
-else
- SHARE_LOCATION=ONE_LOCATION+"/share"
-end
-
-system("sudo #{SHARE_LOCATION}/hooks/fix_owner_perms.sh")
|
|
|
Added |
vmware-2.9.80.tar.bz2/._build.sh
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/._install.sh
^
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/build.sh
^
|
| @@ -1,7 +1,7 @@
#!/bin/bash
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
|
|
|
Added |
vmware-2.9.80.tar.bz2/im/remotes/._vmware.rb
^
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/im/remotes/vmware.rb
^
|
| @@ -1,20 +1,7 @@
#!/usr/bin/env ruby
-ONE_LOCATION=ENV["ONE_LOCATION"]
-
-if !ONE_LOCATION
- RUBY_LIB_LOCATION="/usr/lib/one/ruby"
-else
- RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
-end
-
-$: << RUBY_LIB_LOCATION
-
-require 'OpenNebula'
-include OpenNebula
-
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -34,6 +21,21 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
+ONE_LOCATION=ENV["ONE_LOCATION"] if !defined?(ONE_LOCATION)
+
+if !ONE_LOCATION
+ ETC_LOCATION = "/etc/one" if !defined?(ETC_LOCATION)
+ RUBY_LIB_LOCATION = "/usr/lib/one/ruby" if !defined?(RUBY_LIB_LOCATION)
+else
+ ETC_LOCATION = ONE_LOCATION+"/etc" if !defined?(ETC_LOCATION)
+ RUBY_LIB_LOCATION = ONE_LOCATION+"/lib/ruby" if !defined?(RUBY_LIB_LOCATION)
+end
+
+$: << RUBY_LIB_LOCATION
+
+require 'OpenNebula'
+include OpenNebula
+
begin
client = Client.new()
rescue Exception => e
@@ -52,13 +54,18 @@
@result_str = ""
-@host = ARGV[1]
+@host = ARGV[2]
if !@host
exit -1
end
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+load ETC_LOCATION + "/vmwarerc"
+
+if USERNAME.class!=String || PASSWORD.class!=String
+ warn "Bad ESX credentials, aborting"
+ exit -1
+end
data = perform_action("virsh -c #{LIBVIRT_URI} --readonly nodeinfo")
@@ -73,28 +80,33 @@
}
# Loop through all vms
-used_memory = 0
+used_memory = 0
+used_cpu = 0
vms = VirtualMachinePool.new(client)
if !OpenNebula.is_error?(vms)
vms.info
- vm_ids_array =
- vms.retrieve_elements("/VM_POOL/VM[STATE=3 or STATE=5]/HISTORY[HOSTNAME=\"#{@host}\"]/../ID")
+ vm_ids_array =
+ vms.retrieve_elements("/VM_POOL/VM[STATE=3 or STATE=5]/HISTORY_RECORDS/HISTORY[HOSTNAME=\"#{@host}\"]/../ID")
if vm_ids_array
- vm_ids_array.each do |vm_id|
+ vm_ids_array.each do |vm_id|
vm=OpenNebula::VirtualMachine.new_with_id(vm_id, client)
vm.info
used_memory = used_memory + (vm['TEMPLATE/MEMORY'].to_i * 1024)
+ used_cpu = used_cpu + (vm['TEMPLATE/CPU'].to_f * 100)
end
end
end
# 80% of the total free calculated memory to take hypervisor into account
-free_memory = ($total_memory.to_i - used_memory ) * 0.8
+free_memory = ($total_memory.to_i - used_memory) * 0.8
+# assume all the host's CPU is devoted to running Virtual Machines
+free_cpu = ($total_cpu.to_f - used_cpu)
add_info("HYPERVISOR","vmware")
add_info("TOTALCPU",$total_cpu)
+add_info("FREECPU",free_cpu.to_i)
add_info("CPUSPEED",$cpu_speed)
add_info("TOTALMEMORY",$total_memory)
add_info("FREEMEMORY",free_memory.to_i)
|
|
[-]
[+]
|
Added |
vmware-2.9.80.tar.bz2/image
^
|
| +(directory)
|
|
[-]
[+]
|
Added |
vmware-2.9.80.tar.bz2/image/fs
^
|
| +(directory)
|
|
|
Added |
vmware-2.9.80.tar.bz2/image/fs/._cp
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/image/fs/._mv
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/image/fs/._rm
^
|
|
[-]
[+]
|
Added |
vmware-2.9.80.tar.bz2/image/fs/cp
^
|
| @@ -0,0 +1,71 @@
+#!/bin/bash
+
+# --------------------------------------------------------------------------
+# Copyright 2011, C12G Labs S.L.
+#
+# This file is part of OpenNebula VMware Drivers.
+#
+# OpenNebula VMware Drivers is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or the hope That it will be useful, but (at your
+# option) any later version.
+#
+# OpenNebula VMware Drivers is distributed in WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenNebula VMware Drivers . If not, see
+# <http://www.gnu.org/licenses/>
+# --------------------------------------------------------------------------
+
+###############################################################################
+# This script is used to copy a VM image (SRC) to the image repository as DST
+# Several SRC types are supported
+###############################################################################
+
+# -------- Set up the environment to source common tools & conf ------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+ LIB_LOCATION=/usr/lib/one
+else
+ LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+source $(dirname $0)/fsrc
+
+SRC=$1
+ID=$2
+DST=`generate_image_path`
+
+# ------------ Copy the image to the repository -------------
+
+case $SRC in
+http://*)
+ log "Downloading $SRC to the image repository"
+ exec_and_log "$WGET -O $DST $SRC" \
+ "Error downloading $SRC"
+ exec_and_log "chmod 0660 $DST"
+ ;;
+
+vmware://*)
+ SRC=`echo $SRC|sed 's/vmware:\/\///g'`
+ log "Copying local VMware disk folder $SRC to the image repository"
+ exec_and_log "cp -rf $SRC $DST" \
+ "Error copying $SRC to $DST"
+ exec_and_log "chmod 0770 $DST"
+ ;;
+
+*)
+ log "Copying local image $SRC to the image repository"
+ exec_and_log "cp -f $SRC $DST" \
+ "Error copying $SRC to $DST"
+ exec_and_log "chmod 0660 $DST"
+ ;;
+esac
+
+
+echo "$DST"
|
|
[-]
[+]
|
Added |
vmware-2.9.80.tar.bz2/image/fs/mv
^
|
| @@ -0,0 +1,75 @@
+#!/bin/bash
+
+# --------------------------------------------------------------------------
+# Copyright 2011, C12G Labs S.L.
+#
+# This file is part of OpenNebula VMware Drivers.
+#
+# OpenNebula VMware Drivers is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or the hope That it will be useful, but (at your
+# option) any later version.
+#
+# OpenNebula VMware Drivers is distributed in WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenNebula VMware Drivers . If not, see
+# <http://www.gnu.org/licenses/>
+# --------------------------------------------------------------------------
+
+###############################################################################
+# This script is used to move a VM image (SRC) to the image repository as DST
+# Several SRC types are supported
+###############################################################################
+
+# ------------ Set up the environment to source common tools ------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+ LIB_LOCATION=/usr/lib/one
+ VAR_LOCATION=/var/lib/one
+else
+ LIB_LOCATION=$ONE_LOCATION/lib
+ VAR_LOCATION=$ONE_LOCATION/var
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+source $(dirname $0)/fsrc
+
+SRC=$1
+DST=$2
+ID=$3
+
+# ------------ Generate a filename for the image ------------
+
+if [ "$DST" = "-" ] ; then
+ DST=`generate_image_path`
+fi
+
+# ------------ Move the image to the repository ------------
+
+case $SRC in
+http://*)
+ log "Downloading $SRC to the image repository"
+ exec_and_log "$WGET -O $DST $SRC" \
+ "Error downloading $SRC"
+ ;;
+
+*)
+ log "Moving local image $SRC to the image repository"
+ if [ \( -L $SRC \) -a \( "`$READLINK $SRC`" = "$DST" \) ] ; then
+ log "Not moving files to image repo, they are the same"
+ else
+ exec_and_log "mv -f $SRC $DST" "Could not move $SRC to $DST"
+ fi
+ ;;
+esac
+
+exec_and_log "chmod 0660 $DST"
+
+sudo #{VAR_LOCATION}/hooks/fix_owner_perms.sh
+
+echo "$DST"
|
|
[-]
[+]
|
Added |
vmware-2.9.80.tar.bz2/image/fs/rm
^
|
| @@ -0,0 +1,47 @@
+#!/bin/bash
+
+# --------------------------------------------------------------------------
+# Copyright 2011, C12G Labs S.L.
+#
+# This file is part of OpenNebula VMware Drivers.
+#
+# OpenNebula VMware Drivers is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or the hope That it will be useful, but (at your
+# option) any later version.
+#
+# OpenNebula VMware Drivers is distributed in WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenNebula VMware Drivers . If not, see
+# <http://www.gnu.org/licenses/>
+# --------------------------------------------------------------------------
+
+###############################################################################
+# This script is used to remove a VM image (SRC) from the image repository
+###############################################################################
+
+# ------------ Set up the environment to source common tools ------------
+
+if [ -z "${ONE_LOCATION}" ]; then
+ LIB_LOCATION=/usr/lib/one
+else
+ LIB_LOCATION=$ONE_LOCATION/lib
+fi
+
+. $LIB_LOCATION/sh/scripts_common.sh
+source $(dirname $0)/fsrc
+
+# ------------ Remove the image to the repository ------------
+
+SRC=$1
+
+if [ -e $SRC ] ; then
+ log "Removing $SRC from the image repository"
+ exec_and_log "rm -r $SRC" \
+ "Error deleting $SRC"
+fi
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/install.sh
^
|
| @@ -1,7 +1,7 @@
#!/bin/bash
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -22,13 +22,15 @@
# --------------------------------------------------------------------------
#-------------------------------------------------------------------------------
-# Install program for OpenNebula VMWare Drivers Addon. It will be installed in
+# Install program for OpenNebula VMWare Drivers Addon. It will be installed in
# $ONE_LOCATION if defined, otherwise it'll be installed under /.
#
-# To install in non-gcc platforms and to fine tune C flags, change the CC and CCFLAGS
+# To install in non-gcc platforms and to fine tune C flags,
+# change the CC and CCFLAGS
#-------------------------------------------------------------------------------
DIR=`dirname $0`
+VERSION=2.9.80
#-------------------------------------------------------------------------------
# Path location
@@ -37,42 +39,43 @@
BIN_LOCATION="$ONE_LOCATION/bin"
LIB_LOCATION="$ONE_LOCATION/lib"
ETC_LOCATION="$ONE_LOCATION/etc"
- SHARE_LOCATION="$ONE_LOCATION/share"
+ VAR_LOCATION="$ONE_LOCATION/var"
+ ADDON_DIR=$HOME
else
BIN_LOCATION="/usr/bin"
LIB_LOCATION="/usr/lib/one"
ETC_LOCATION="/etc/one"
- SHARE_LOCATION="/usr/share/one"
+ VAR_LOCATION="/var/lib/one"
+ ADDON_DIR=$(getent passwd|grep ^${ONE_USER:=oneadmin}:|cut -d: -f6)
fi
if [ "$1" != "nobuild" ]; then
$DIR/build.sh
fi
-
+
# Make dirs and copy files
# tty_expect
cp $DIR/src/tty_expect/tty_expect $DESTDIR$BIN_LOCATION || error=true
chmod +x $DESTDIR$BIN_LOCATION/tty_expect
-# bin
-cp $DIR/lib/onevmware $DESTDIR$BIN_LOCATION || error=true
-
# lib
cp $DIR/lib/vmwarelib.rb $DESTDIR$LIB_LOCATION/ruby || error=true
-cp $DIR/lib/ImageRepositoryVMware.rb $DESTDIR$LIB_LOCATION/ruby/OpenNebula || error=true
cp $DIR/share/vmwarerc $DESTDIR$ETC_LOCATION || error=true
-cp -p $DIR/share/fix_owner_perms.sh $DESTDIR$SHARE_LOCATION/hooks || error=true
+cp -p $DIR/share/fix_owner_perms.sh $DESTDIR$VAR_LOCATION/remotes/hooks || error=true
-# vmm
-mkdir -p $DESTDIR$LIB_LOCATION/remotes/vmm/vmware || error=true
+# vmm
+mkdir -p $DESTDIR$VAR_LOCATION/remotes/vmm/vmware || error=true
mkdir $DESTDIR$ETC_LOCATION/vmm_sh &> /dev/null
-cp -r $DIR/vmm/remotes/* $DESTDIR$LIB_LOCATION/remotes/vmm/vmware || error=true
+cp -r $DIR/vmm/remotes/* $DESTDIR$VAR_LOCATION/remotes/vmm/vmware || error=true
cp -r $DIR/vmm/etc/* $DESTDIR$ETC_LOCATION/vmm_sh || error=true
# im
-mkdir -p $DESTDIR$LIB_LOCATION/remotes/im/vmware.d || error=true
-cp -r $DIR/im/remotes/* $DESTDIR$LIB_LOCATION/remotes/im/vmware.d || error=true
+mkdir -p $DESTDIR$VAR_LOCATION/remotes/im/vmware.d || error=true
+cp -r $DIR/im/remotes/* $DESTDIR$VAR_LOCATION/remotes/im/vmware.d || error=true
+
+# image
+cp $DIR/image/fs/* $DESTDIR$VAR_LOCATION/remotes/image/fs || error=true
# tm
mkdir $DESTDIR$ETC_LOCATION/tm_vmware &> /dev/null
@@ -80,25 +83,14 @@
cp $DIR/tm/etc/tm_vmware.conf $DESTDIR$ETC_LOCATION/tm_vmware || error=true
cp $DIR/tm/commands/* $DESTDIR$LIB_LOCATION/tm_commands/vmware || error=true
-# Make changes to image hook
-LAST_HOOK_LINE=`tail -1 $DESTDIR$SHARE_LOCATION/hooks/image.rb`
-LAST_ADDITION_LINE=`tail -1 $DIR/share/image.rb.addition`
-
-if [ "x$LAST_HOOK_LINE" != "x$LAST_ADDITION_LINE" ]; then
- cat $DIR/share/image.rb.addition >> $DESTDIR$SHARE_LOCATION/hooks/image.rb || error=true
-fi
-
-if [ ! -e $HOME/.one/addons ]; then
- mkdir $HOME/.one/addons || error
-fi
-
-echo "2.2.0" > $HOME/.one/addons/vmware || error
+mkdir -p $ADDON_DIR/.one/addons/vmware &> /dev/null
+echo "$VERSION" > $ADDON_DIR/.one/addons/vmware/version &> /dev/null
# Report error or success
if [ -n "$error" ]; then
echo "There was a problem with the installation"
else
echo "VMWare Drivers Addon successfully installed"
- echo
+ echo
cat $DIR/share/oned.conf.vmware.README
fi
|
|
|
Added |
vmware-2.9.80.tar.bz2/lib/._vmwarelib.rb
^
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/lib/vmwarelib.rb
^
|
| @@ -1,5 +1,5 @@
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -23,14 +23,18 @@
# Set up the environment for the driver #
# ---------------------------------------------------------------------------- #
-ONE_LOCATION = ENV["ONE_LOCATION"]
+ONE_LOCATION = ENV["ONE_LOCATION"] if !defined?(ONE_LOCATION)
if !ONE_LOCATION
- RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
- ETC_LOCATION = "/etc/one/"
+ BIN_LOCATION = "/usr/bin" if !defined?(BIN_LOCATION)
+ ETC_LOCATION = "/etc/one/" if !defined?(ETC_LOCATION)
+ RUBY_LIB_LOCATION = "/usr/lib/one/ruby" if !defined?(RUBY_LIB_LOCATION)
else
- RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
- ETC_LOCATION = ONE_LOCATION + "/etc/"
+ BIN_LOCATION = ONE_LOCATION + "/bin" if !defined?(BIN_LOCATION)
+ ETC_LOCATION = ONE_LOCATION + "/etc/" if !defined?(ETC_LOCATION)
+ if !defined?(RUBY_LIB_LOCATION)
+ RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
+ end
end
$: << RUBY_LIB_LOCATION
@@ -38,17 +42,17 @@
require "OpenNebulaDriver"
require "CommandManager"
-# Do host sustitution in the libvirt URI
+# Do host sustitution in the libvirt URI
LIBVIRT_URI.gsub!('@HOST@', @host)
# Common functions
-def perform_action(command)
- command = ENV['ONE_LOCATION'] + "/bin/tty_expect -u " + USERNAME + " -p " + PASSWORD + " " + command
-
+def perform_action(command)
+ command = BIN_LOCATION + "/tty_expect -u " + USERNAME + " -p " + PASSWORD + " " + command
+
action_result = LocalCommand.run(command)
if action_result.code == 0
- return action_result.stdout
+ return action_result.stdout
else
log(command, action_result.stderr, action_result.stdout)
return action_result.code
@@ -56,6 +60,6 @@
end
def log(cmd, stdout, stderr)
- STDERR.puts "[VMWARE] cmd failed [" + cmd +
+ STDERR.puts "[VMWARE] cmd failed [" + cmd +
"]. Stderr: " + stderr + ". Stdout: " + stdout
end
|
|
|
Added |
vmware-2.9.80.tar.bz2/share/._fix_owner_perms.sh
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/share/._vmwarerc
^
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/share/fix_owner_perms.sh
^
|
| @@ -1,7 +1,7 @@
#!/bin/bash
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -21,21 +21,24 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
-
# --------------------------------------------------------------------------
-# Parameters for the hook. Needs to know
-# * the path to the image repository. This should be the same
+# Parameters for the hook. Needs to know
+# * the path to the image repository. This should be the same
# as set in $ONE_LOCATION/etc/oned.conf
# * the username that runs opennebula (typically, oneadmin)
# --------------------------------------------------------------------------
-IMAGE_REPOSITORY_PATH=$ONE_LOCATION/var/images
-USERNAME=oneadmin
+if [ -n "$ONE_LOCATION" ]; then
+ VAR_LOCATION="$ONE_LOCATION/var"
+else
+ VAR_LOCATION="/var/lib/one"
+fi
+
+IMAGE_REPOSITORY_PATH=$VAR_LOCATION/var/images
# --------------------------------------------------------------------------
# Change the permissions of all the files inside directoriers (= VMware disks)
-
# --------------------------------------------------------------------------
-find $IMAGE_REPOSITORY_PATH -type d -mindepth 1 -maxdepth 1 -execdir chown -R $USERNAME '{}' \;
+find $IMAGE_REPOSITORY_PATH -type d -mindepth 1 -maxdepth 1 -execdir chown -R $SUDO_USER '{}' \;
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/share/oned.conf.vmware.README
^
|
| @@ -10,8 +10,7 @@
arguments = "vmware",
default = "vmm_sh/vmm_sh_vmware.conf",
type = "vmware" ]
-
-
+
#-------------------------------------------------------------------------------
# VMware Driver Addon Information Driver Manager Configuration
#-------------------------------------------------------------------------------
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/share/vmwarerc
^
|
| @@ -1,5 +1,5 @@
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -19,7 +19,6 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
-
# User configurable variables (Ruby syntax)
LIBVIRT_URI = "esx://@HOST@/?no_verify=1"
QEMU_PROTOCOL = "qemu"
|
|
|
Added |
vmware-2.9.80.tar.bz2/src/tty_expect/._tty_expect.c
^
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/src/tty_expect/tty_expect.c
^
|
| @@ -1,23 +1,23 @@
-/* --------------------------------------------------------------------------
-* Copyright 2010, C12G Labs S.L.
-*
-* This file is part of OpenNebula VMware Drivers.
-*
-* OpenNebula VMware Drivers is free software: you can redistribute it
-* and/or modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation, either version 3 of
-* the License, or the hope That it will be useful, but (at your
-* option) any later version.
-*
-* OpenNebula VMware Drivers is distributed in WITHOUT ANY WARRANTY;
-* without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-* A PARTICULAR PURPOSE. See the GNU General Public License for more
-* details.
-*
-* You should have received a copy of the GNU General Public License
-* along with OpenNebula VMware Drivers . If not, see
-* <http://www.gnu.org/licenses/>
-* -------------------------------------------------------------------------*/
+/*# --------------------------------------------------------------------------
+# Copyright 2011, C12G Labs S.L.
+#
+# This file is part of OpenNebula VMware Drivers.
+#
+# OpenNebula VMware Drivers is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or the hope That it will be useful, but (at your
+# option) any later version.
+#
+# OpenNebula VMware Drivers is distributed in WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenNebula VMware Drivers . If not, see
+# <http://www.gnu.org/licenses/>
+# --------------------------------------------------------------------------*/
#include <pty.h>
|
|
|
Added |
vmware-2.9.80.tar.bz2/tm/.DS_Store
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/tm/commands/._tm_clone.sh
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/tm/commands/._tm_ln.sh
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/tm/commands/._tm_mv.sh
^
|
|
[-]
[+]
|
Added |
vmware-2.9.80.tar.bz2/tm/commands/tm_clone.sh
^
|
| @@ -0,0 +1,74 @@
+#!/bin/bash
+
+# --------------------------------------------------------------------------
+# Copyright 2011, C12G Labs S.L.
+#
+# This file is part of OpenNebula VMware Drivers.
+#
+# OpenNebula VMware Drivers is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or the hope That it will be useful, but (at your
+# option) any later version.
+#
+# OpenNebula VMware Drivers is distributed in WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenNebula VMware Drivers . If not, see
+# <http://www.gnu.org/licenses/>
+# --------------------------------------------------------------------------
+
+SRC=$1
+DST=$2
+
+if [ -z "${ONE_LOCATION}" ]; then
+ TMCOMMON=/usr/lib/one/mads/tm_common.sh
+else
+ TMCOMMON=$ONE_LOCATION/lib/mads/tm_common.sh
+fi
+
+. $TMCOMMON
+
+get_vmdir
+
+SRC_PATH=`arg_path $SRC`
+DST_PATH=`arg_path $DST`
+
+fix_paths
+
+log_debug "$1 $2"
+log_debug "DST: $DST_PATH"
+
+DST_DIR=`dirname $DST_PATH`
+
+log "Creating directory $DST_DIR"
+exec_and_log "mkdir -p $DST_DIR"
+exec_and_log "chmod a+w $DST_DIR"
+
+case $SRC in
+http://*)
+ log "Downloading $SRC"
+ exec_and_log "$WGET -O $DST_PATH $SRC" \
+ "Error downloading $SRC"
+ ;;
+
+*)
+ log "Cloning $SRC_PATH"
+ exec_and_log "cp -r $SRC_PATH $DST_PATH" \
+ "Error copying $SRC to $DST"
+ ;;
+esac
+
+SRC_FILE_SUFFIX=`echo ${SRC_PATH##*.}`
+
+if [ "x$SRC_FILE_SUFFIX" == "xiso" ]; then
+ cd $DST_DIR
+ DISK_NAME = `basename $DST_PATH`
+ ln -s $DISK_NAME $DISK_NAME.iso
+fi
+
+exec_and_log "chmod a+rw $DST_PATH"
+
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/tm/commands/tm_ln.sh
^
|
| @@ -1,7 +1,7 @@
#!/bin/bash
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/tm/commands/tm_mv.sh
^
|
| @@ -1,7 +1,7 @@
#!/bin/bash
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
|
|
|
Added |
vmware-2.9.80.tar.bz2/tm/etc/._tm_vmware.conf
^
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/tm/etc/tm_vmware.conf
^
|
| @@ -1,5 +1,5 @@
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
|
|
|
Added |
vmware-2.9.80.tar.bz2/vmm/etc/._vmm_sh_vmware.conf
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/vmm/etc/._vmm_sh_vmwarerc
^
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/vmm/etc/vmm_sh_vmware.conf
^
|
| @@ -1,5 +1,5 @@
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -25,11 +25,13 @@
# - memory
# - cpu
# - os[arch]
+# - disk[dirver]
# - datastore
CPU = 1
MEMORY = 256
OS = [ ARCH = i686 ]
+DISK = [ DRIVER = file ]
# Name of the datastore in the remote VMware hypervisors
# mounting $ONE_LOCATION/var exported as a nfs share
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/vmm/etc/vmm_sh_vmwarerc
^
|
| @@ -1,5 +1,5 @@
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -19,5 +19,5 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
-# Uncomment the following line to active MAD debug
+# Uncomment the following line to active MAD debug
#ONE_MAD_DEBUG=1
|
|
|
Added |
vmware-2.9.80.tar.bz2/vmm/remotes/._cancel
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/vmm/remotes/._deploy
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/vmm/remotes/._migrate
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/vmm/remotes/._poll
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/vmm/remotes/._restore
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/vmm/remotes/._save
^
|
|
|
Added |
vmware-2.9.80.tar.bz2/vmm/remotes/._shutdown
^
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/vmm/remotes/cancel
^
|
| @@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -21,17 +21,30 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
-@host = ARGV[0]
-deploy_id = ARGV[1]
+ONE_LOCATION=ENV["ONE_LOCATION"] if !defined?(ONE_LOCATION)
-if !@host or !deploy_id
+if !ONE_LOCATION
+ ETC_LOCATION="/etc/one" if !defined?(ETC_LOCATION)
+else
+ ETC_LOCATION=ONE_LOCATION+"/etc" if !defined?(ETC_LOCATION)
+end
+
+deploy_id = ARGV[0]
+@host = ARGV[1]
+
+if !@host or !deploy_id
exit -1
end
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+load ETC_LOCATION + "/vmwarerc"
+
+if USERNAME.class!=String || PASSWORD.class!=String
+ warn "Bad ESX credentials, aborting"
+ exit -1
+end
# Destroy the VM
-data = perform_action("virsh -c #{LIBVIRT_URI} destroy #{deploy_id}")
+data = perform_action("virsh -c #{LIBVIRT_URI} destroy #{deploy_id}")
if data.class == Fixnum
exit data
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/vmm/remotes/deploy
^
|
| @@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -21,14 +21,27 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
-@host = ARGV[0]
-deployment_file = ARGV[1]
+ONE_LOCATION=ENV["ONE_LOCATION"] if !defined?(ONE_LOCATION)
+
+if !ONE_LOCATION
+ ETC_LOCATION="/etc/one" if !defined?(ETC_LOCATION)
+else
+ ETC_LOCATION=ONE_LOCATION+"/etc" if !defined?(ETC_LOCATION)
+end
+
+deployment_file = ARGV[0]
+@host = ARGV[1]
if !@host or !deployment_file
exit -1
end
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+load ETC_LOCATION + "/vmwarerc"
+
+if USERNAME.class!=String || PASSWORD.class!=String
+ warn "Bad ESX credentials, aborting"
+ exit -1
+end
# Define the VM
data = perform_action("virsh -c #{LIBVIRT_URI} define #{deployment_file}")
@@ -52,7 +65,7 @@
exit -1
end
-domainname = domainname[1]
+domainname = domainname[1]
# Start the VM
data = perform_action("virsh -c #{LIBVIRT_URI} start #{domainname}")
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/vmm/remotes/migrate
^
|
| @@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/vmm/remotes/poll
^
|
| @@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -21,18 +21,32 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
-@host = ARGV[0]
-deploy_id = ARGV[1]
+ONE_LOCATION=ENV["ONE_LOCATION"] if !defined?(ONE_LOCATION)
+
+if !ONE_LOCATION
+ ETC_LOCATION="/etc/one" if !defined?(ETC_LOCATION)
+else
+ ETC_LOCATION=ONE_LOCATION+"/etc" if !defined?(ETC_LOCATION)
+end
+
+
+deploy_id = ARGV[0]
+@host = ARGV[1]
if !@host or !deploy_id
exit -1
end
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+load ETC_LOCATION + "/vmwarerc"
+
+if USERNAME.class!=String || PASSWORD.class!=String
+ warn "Bad ESX credentials, aborting"
+ exit -1
+end
data = perform_action(
- "virsh -c #{LIBVIRT_URI} --readonly dominfo #{deploy_id}")
-
+ "virsh -c #{LIBVIRT_URI} --readonly dominfo #{deploy_id}")
+
if data.class == Fixnum
puts "STATE=d"
exit 0
@@ -43,7 +57,7 @@
data.split('\n').each{ |line|
state = line.match("^State: (.*)")
- if state
+ if state
state = state[1].strip
break
end
@@ -55,7 +69,7 @@
when "running","blocked","shutdown","dying"
state_short = 'a'
when "paused"
- state_short = 'p'
+ state_short = 'p'
when "crashed"
state_short = 'c'
else
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/vmm/remotes/restore
^
|
| @@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -21,19 +21,32 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
-@host = ARGV[0]
-file = ARGV[1]
+ONE_LOCATION=ENV["ONE_LOCATION"] if !defined?(ONE_LOCATION)
+
+if !ONE_LOCATION
+ ETC_LOCATION="/etc/one" if !defined?(ETC_LOCATION)
+else
+ ETC_LOCATION=ONE_LOCATION+"/etc" if !defined?(ETC_LOCATION)
+end
+
+file = ARGV[0]
+@host = ARGV[1]
if !@host or !file
exit -1
end
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+load ETC_LOCATION + "/vmwarerc"
+
+if USERNAME.class!=String || PASSWORD.class!=String
+ warn "Bad ESX credentials, aborting"
+ exit -1
+end
# Define the VM
deployment_file = File.dirname(File.dirname(file)) + "/deployment.0"
-data = perform_action("virsh -c #{LIBVIRT_URI} define #{deployment_file}")
+data = perform_action("virsh -c #{LIBVIRT_URI} define #{deployment_file}")
if data.class == Fixnum
exit data
@@ -56,13 +69,13 @@
domainname = domainname[1]
-# Revert snapshot VM
+# Revert snapshot VM
# Note: This assumes the checkpoint name is "checkpoint", to change this
-# it is needed to change also
+# it is needed to change also
# $ONE_LOCATION/lib/remotes/vmm/vmware/checkpoint
data = perform_action(
- "virsh -c #{LIBVIRT_URI} snapshot-revert #{domainname} checkpoint")
+ "virsh -c #{LIBVIRT_URI} snapshot-revert #{domainname} checkpoint")
if data.class == Fixnum
exit data
@@ -70,7 +83,7 @@
# Delete checkpoint
data = perform_action(
- "virsh -c #{LIBVIRT_URI} snapshot-delete #{domainname} checkpoint")
+ "virsh -c #{LIBVIRT_URI} snapshot-delete #{domainname} checkpoint")
if data.class == Fixnum
exit data
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/vmm/remotes/save
^
|
| @@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -21,19 +21,34 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
-@host = ARGV[0]
-deploy_id = ARGV[1]
-file = ARGV[2]
+ONE_LOCATION=ENV["ONE_LOCATION"] if !defined?(ONE_LOCATION)
+
+if !ONE_LOCATION
+ ETC_LOCATION = "/etc/one" if !defined?(ETC_LOCATION)
+ VAR_LOCATION = "/var/lib/one" if !defined?(VAR_LOCATION)
+else
+ ETC_LOCATION = ONE_LOCATION + "/etc" if !defined?(ETC_LOCATION)
+ VAR_LOCATION = ONE_LOCATION + "/var" if !defined?(VAR_LOCATION)
+end
+
+deploy_id = ARGV[0]
+file = ARGV[1]
+@host = ARGV[2]
if !@host or !deploy_id or !file
exit -1
end
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+load ETC_LOCATION + "/vmwarerc"
+
+if USERNAME.class!=String || PASSWORD.class!=String
+ warn "Bad ESX credentials, aborting"
+ exit -1
+end
# Create snapshot
-checkpoint_xml_file = ENV['ONE_LOCATION'] +
- "/lib/remotes/vmm/vmware/checkpoint"
+checkpoint_xml_file = VAR_LOCATION + "/remotes/vmm/vmware/checkpoint"
+
data = perform_action(
"virsh -c #{LIBVIRT_URI} snapshot-create #{deploy_id} #{checkpoint_xml_file}")
@@ -42,14 +57,14 @@
end
# Suspend VM
-data = perform_action("virsh -c #{LIBVIRT_URI} suspend #{deploy_id}")
+data = perform_action("virsh -c #{LIBVIRT_URI} suspend #{deploy_id}")
if data.class == Fixnum
exit data
end
# Undefine VM
-data = perform_action("virsh -c #{LIBVIRT_URI} undefine #{deploy_id}")
+data = perform_action("virsh -c #{LIBVIRT_URI} undefine #{deploy_id}")
if data.class == Fixnum
exit data
|
|
[-]
[+]
|
Changed |
vmware-2.9.80.tar.bz2/vmm/remotes/shutdown
^
|
| @@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# --------------------------------------------------------------------------
-# Copyright 2010, C12G Labs S.L.
+# Copyright 2011, C12G Labs S.L.
#
# This file is part of OpenNebula VMware Drivers.
#
@@ -21,14 +21,27 @@
# <http://www.gnu.org/licenses/>
# --------------------------------------------------------------------------
-@host = ARGV[0]
-deploy_id = ARGV[1]
+ONE_LOCATION=ENV["ONE_LOCATION"] if !defined?(ONE_LOCATION)
-if !@host or !deploy_id
+if !ONE_LOCATION
+ ETC_LOCATION="/etc/one" if !defined?(ETC_LOCATION)
+else
+ ETC_LOCATION=ONE_LOCATION+"/etc" if !defined?(ETC_LOCATION)
+end
+
+deploy_id = ARGV[0]
+@host = ARGV[1]
+
+if !@host or !deploy_id
exit -1
end
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+load ETC_LOCATION + "/vmwarerc"
+
+if USERNAME.class!=String || PASSWORD.class!=String
+ warn "Bad ESX credentials, aborting"
+ exit -1
+end
data = perform_action("virsh -c #{LIBVIRT_URI} shutdown #{deploy_id}")
@@ -36,14 +49,14 @@
exit data
end
-begin
+begin
data = perform_action("virsh -c #{LIBVIRT_URI} list")
if data.class == Fixnum
exit data
end
sleep 2
end while data.match(deploy_id)
-
+
data = perform_action("virsh -c #{LIBVIRT_URI} undefine #{deploy_id}")
if data.class == Fixnum
|
