diff options
| -rw-r--r-- | LICENSE | 182 | ||||
| -rw-r--r-- | README.rst | 13 | ||||
| -rw-r--r-- | docs/conf.py | 8 | ||||
| -rw-r--r-- | docs/index.rst | 2 | ||||
| -rw-r--r-- | docs/releases.rst | 7 | ||||
| -rw-r--r-- | docs/shell.rst | 14 | ||||
| -rw-r--r-- | novatools/__init__.py | 23 | ||||
| -rw-r--r-- | novatools/backup_schedules.py | 21 | ||||
| -rw-r--r-- | novatools/base.py | 17 | ||||
| -rw-r--r-- | novatools/client.py | 21 | ||||
| -rw-r--r-- | novatools/exceptions.py | 21 | ||||
| -rw-r--r-- | novatools/flavors.py | 22 | ||||
| -rw-r--r-- | novatools/images.py | 21 | ||||
| -rw-r--r-- | novatools/ipgroups.py | 21 | ||||
| -rw-r--r-- | novatools/servers.py | 21 | ||||
| -rw-r--r-- | novatools/shell.py | 29 | ||||
| -rw-r--r-- | novatools/zones.py | 21 | ||||
| -rw-r--r-- | setup.py | 8 |
18 files changed, 443 insertions, 29 deletions
@@ -1,5 +1,183 @@ -Copyright (c) 2009 Jacob Kaplan-Moss - initial codebase -Copyright (c) 2011 Rackspace - OpenStack extensions +Copyright (c) 2009 Jacob Kaplan-Moss - initial codebase (< v2.0) +Copyright (c) 2011 Rackspace - OpenStack extensions (>= v2.0) + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +--- License for python-novatools versions prior to 2.0 --- All rights reserved. @@ -2,7 +2,7 @@ Python bindings to the OpenStack Nova API ================================================== This is a client for the OpenStack Nova API. There's a Python API (the -``novatools`` module), and a command-line script (``novatools``). Each +``novatools`` module), and a command-line script (``nova``). Each implements 100% of the OpenStack Nova API. [PENDING] `Full documentation is available`__. @@ -21,7 +21,8 @@ Development takes place on GitHub__. Bug reports and patches may be filed there. __ https://github.com/rackspace/python-novatools This code a fork of `Jacobian's python-cloudservers`__ If you need API support -the Rackspace API soley, you should use that repository. +for the Rackspace API soley or the BSD license, you should use that repository. +python-novatools is licensed under the Apache License like the rest of OpenStack. __ http://github.com/jacobian/python-cloudservers @@ -31,7 +32,7 @@ __ http://github.com/jacobian/python-cloudservers Command-line API ---------------- -Installing this package gets you a shell command, ``novatools``, that you +Installing this package gets you a shell command, ``nova``, that you can use to interact with any Rackspace compatible API (including OpenStack). You'll need to provide your OpenStack username and API key. You can do this @@ -47,9 +48,9 @@ an environment variable as well:: export NOVA_URL=http://myserver:port/v1.0/ You'll find complete documentation on the shell by running -``novatools help``:: +``nova help``:: - usage: novatools [--username USERNAME] [--apikey APIKEY] + usage: nova [--username USERNAME] [--apikey APIKEY] [--url AUTH_URL] <subcommand> ... Command-line interface to the OpenStack Nova API. @@ -96,7 +97,7 @@ You'll find complete documentation on the shell by running https://auth.api.rackspacecloud.com/v1.0 if undefined. - See "novatools help COMMAND" for help on a specific command. + See "nova help COMMAND" for help on a specific command. Python API ---------- diff --git a/docs/conf.py b/docs/conf.py index 323df9c3..c75f3422 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -38,16 +38,16 @@ master_doc = 'index' # General information about the project. project = u'python-novatools' -copyright = u'Rackspace, with inital work done by Jacob Kaplan-Moss' +copyright = u'Rackspace, based on work by Jacob Kaplan-Moss' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '2.0' +version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.0' +release = '2.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -173,7 +173,7 @@ htmlhelp_basename = 'python-novatoolsdoc' # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ ('index', 'python-novatools.tex', u'python-novatools Documentation', - u'Rackspace with initial work by Jacob Kaplan-Moss', 'manual'), + u'Rackspace - based on work by Jacob Kaplan-Moss', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of diff --git a/docs/index.rst b/docs/index.rst index a82f034b..c798e9b6 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,7 +3,7 @@ Python bindings to the OpenStack Nova API This is a client for OpenStack Nova API. There's :doc:`a Python API <api>` (the :mod:`novatools` module), and a :doc:`command-line script -<shell>` (installed as :program:`novatools`). Each implements the entire +<shell>` (installed as :program:`nova`). Each implements the entire OpenStack Nova API. You'll need an `OpenStack Nova` account, which you can get by using `nova-manage`. diff --git a/docs/releases.rst b/docs/releases.rst index bfffce4b..b0334d8f 100644 --- a/docs/releases.rst +++ b/docs/releases.rst @@ -2,6 +2,13 @@ Release notes ============= +2.1 (Feb 28, 2011) +================= + +* shell renamed to nova from novatools + +* license changed from BSD to Apache + 2.0 (Feb 7, 2011) ================= diff --git a/docs/shell.rst b/docs/shell.rst index c2b476f2..26652f08 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -1,16 +1,16 @@ -The :program:`novatools` shell utility +The :program:`nova` shell utility ========================================= -.. program:: novatools +.. program:: nova .. highlight:: bash -The :program:`novatools` shell utility interacts with OpenStack Nova API +The :program:`nova` shell utility interacts with OpenStack Nova API from the command line. It supports the entirety of the OpenStack Nova API. First, you'll need an OpenStack Nova account and an API key. You get this by using the `nova-manage` command in OpenStack Nova. -You'll need to provide :program:`novatools` with your OpenStack username and +You'll need to provide :program:`nova` with your OpenStack username and API key. You can do this with the :option:`--username` and :option:`--apikey` options, but it's easier to just set them as environment variables by setting two environment variables: @@ -30,8 +30,8 @@ For example, in Bash you'd use:: From there, all shell commands take the form:: - novatools <command> [arguments...] + nova <command> [arguments...] -Run :program:`novatools help` to get a full list of all possible commands, -and run :program:`novatools help <command>` to get detailed help for that +Run :program:`nova help` to get a full list of all possible commands, +and run :program:`nova help <command>` to get detailed help for that command. diff --git a/novatools/__init__.py b/novatools/__init__.py index efa28529..1991f647 100644 --- a/novatools/__init__.py +++ b/novatools/__init__.py @@ -1,4 +1,25 @@ -__version__ = '2.0' +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +novatools module. +""" + +__version__ = '2.1' from novatools.backup_schedules import ( BackupSchedule, BackupScheduleManager, diff --git a/novatools/backup_schedules.py b/novatools/backup_schedules.py index 434ae715..00b8c320 100644 --- a/novatools/backup_schedules.py +++ b/novatools/backup_schedules.py @@ -1,3 +1,24 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +Backup Schedule interface. +""" + from novatools import base BACKUP_WEEKLY_DISABLED = 'DISABLED' diff --git a/novatools/base.py b/novatools/base.py index 10c28d21..7e79b3f9 100644 --- a/novatools/base.py +++ b/novatools/base.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + """ Base utilities to build API operation managers and objects on top of. """ diff --git a/novatools/client.py b/novatools/client.py index e7150f0d..e46cd876 100644 --- a/novatools/client.py +++ b/novatools/client.py @@ -1,3 +1,24 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +OpenStack Client interface. Handles the REST calls and responses. +""" + import time import urlparse import urllib diff --git a/novatools/exceptions.py b/novatools/exceptions.py index 6ead2c45..53c0c9f2 100644 --- a/novatools/exceptions.py +++ b/novatools/exceptions.py @@ -1,3 +1,24 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +Exception definitions. +""" + class OpenStackException(Exception): """ The base exception class for all exceptions this library raises. diff --git a/novatools/flavors.py b/novatools/flavors.py index 8286246f..18fd61dd 100644 --- a/novatools/flavors.py +++ b/novatools/flavors.py @@ -1,3 +1,25 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +Flavor interface. +""" + + from novatools import base diff --git a/novatools/images.py b/novatools/images.py index 35258d23..0d3bf316 100644 --- a/novatools/images.py +++ b/novatools/images.py @@ -1,3 +1,24 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +Image interface. +""" + from novatools import base diff --git a/novatools/ipgroups.py b/novatools/ipgroups.py index 05494528..925ebc52 100644 --- a/novatools/ipgroups.py +++ b/novatools/ipgroups.py @@ -1,3 +1,24 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +IP Group interface. +""" + from novatools import base diff --git a/novatools/servers.py b/novatools/servers.py index 102399b9..0c9edab9 100644 --- a/novatools/servers.py +++ b/novatools/servers.py @@ -1,3 +1,24 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +Server interface. +""" + from novatools import base REBOOT_SOFT, REBOOT_HARD = 'SOFT', 'HARD' diff --git a/novatools/shell.py b/novatools/shell.py index 68a676d7..7e5bab34 100644 --- a/novatools/shell.py +++ b/novatools/shell.py @@ -1,3 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + """ Command-line interface to the OpenStack Nova API. """ @@ -52,9 +69,9 @@ class OpenStackShell(object): def __init__(self): self.parser = argparse.ArgumentParser( - prog='novatools', + prog='nova', description=__doc__.strip(), - epilog='See "novatools help COMMAND" '\ + epilog='See "nova help COMMAND" '\ 'for help on a specific command.', add_help=False, formatter_class=OpenStackHelpFormatter, @@ -605,6 +622,10 @@ def print_dict(d): def main(): try: OpenStackShell().main(sys.argv[1:]) - except CommandError, e: - print >> sys.stderr, e + + except Exception, e: + if httplib2.debuglevel == 1: + raise # dump stack. + else: + print >> sys.stderr, e sys.exit(1) diff --git a/novatools/zones.py b/novatools/zones.py index b70d429f..6ff62516 100644 --- a/novatools/zones.py +++ b/novatools/zones.py @@ -1,3 +1,24 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +Zone interface. +""" + from novatools import base @@ -11,11 +11,11 @@ if sys.version_info < (2,6): setup( name = "python-novatools", - version = "2.0", + version = "2.1", description = "Client library for OpenStack Nova API", long_description = read('README.rst'), url = 'https://github.com/rackspace/python-novatools', - license = 'BSD', + license = 'Apache', author = 'Rackspace, based on work by Jacob Kaplan-Moss', author_email = 'github@racklabs.com', packages = find_packages(exclude=['tests']), @@ -24,7 +24,7 @@ setup( 'Environment :: Console', 'Intended Audience :: Developers', 'Intended Audience :: Information Technology', - 'License :: OSI Approved :: BSD License', + 'License :: OSI Approved :: Apache License', 'Operating System :: OS Independent', 'Programming Language :: Python', ], @@ -34,6 +34,6 @@ setup( test_suite = "nose.collector", entry_points = { - 'console_scripts': ['novatools = novatools.shell:main'] + 'console_scripts': ['nova = novatools.shell:main'] } ) |