Retiring App Catalog
This commit removes content associated with the app catalog. This is part of the first step, following the guide at: https://docs.openstack.org/infra/manual/drivers.html#retiring-a-project Earlier this year the TC agreed to retire this project: https://review.openstack.org/#/c/452086/ In July, Fungi sent a note to the operators list as well: http://lists.openstack.org/pipermail/openstack-operators/2017-July/013965.html Depends-On: I52ce13057643d69a0fd87bce20ee460c6b7c2f17 Change-Id: I4d6c8b64f07ccaa60f977fab7db146465ec159c4
This commit is contained in:
parent
95694f84e6
commit
c2aafc8bc1
|
@ -1,37 +0,0 @@
|
|||
# Compiled files
|
||||
*.py[co]
|
||||
*.a
|
||||
*.o
|
||||
*.so
|
||||
|
||||
# Sphinx
|
||||
_build
|
||||
doc/source/api/
|
||||
|
||||
# Release notes
|
||||
releasenotes/build
|
||||
|
||||
# Packages/installer info
|
||||
*.egg
|
||||
*.egg-info
|
||||
dist
|
||||
build
|
||||
eggs
|
||||
parts
|
||||
var
|
||||
sdist
|
||||
develop-eggs
|
||||
.installed.cfg
|
||||
|
||||
# Other
|
||||
*.DS_Store
|
||||
.testrepository
|
||||
.tox
|
||||
.venv
|
||||
.*.swp
|
||||
.coverage
|
||||
cover
|
||||
AUTHORS
|
||||
ChangeLog
|
||||
*.sqlite
|
||||
test.conf
|
|
@ -1,4 +0,0 @@
|
|||
[gerrit]
|
||||
host=review.openstack.org
|
||||
port=29418
|
||||
project=openstack/python-appcatalogclient.git
|
|
@ -1,4 +0,0 @@
|
|||
[DEFAULT]
|
||||
test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 coverage run -m subunit.run discover -t ./ -s ./appcatalogclient/tests/unit $LISTOPT $IDOPTION
|
||||
test_id_option=--load-list $IDFILE
|
||||
test_list_option=--list
|
176
LICENSE
176
LICENSE
|
@ -1,176 +0,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.
|
||||
|
38
README.rst
38
README.rst
|
@ -1,32 +1,10 @@
|
|||
Python App Catalog Client
|
||||
=========================
|
||||
This project is no longer maintained.
|
||||
|
||||
This is the Community App Catalog OpenStack Client Plugin.
|
||||
The contents of this repository are still available in the Git
|
||||
source code management system. To see the contents of this
|
||||
repository before it reached its end of life, please check out the
|
||||
previous commit with "git checkout HEAD^1".
|
||||
|
||||
How to Install
|
||||
--------------
|
||||
|
||||
To install without a virtualenv::
|
||||
|
||||
git clone https://github.com/openstack/python-appcatalogclient
|
||||
cd python-appcatalogclient
|
||||
pip install .
|
||||
|
||||
To install using a virtualenv::
|
||||
|
||||
git clone https://github.com/openstack/python-appcatalogclient
|
||||
cd python-appcatalogclient
|
||||
virtualenv .venv
|
||||
source .venv/bin/activate
|
||||
pip install .
|
||||
|
||||
Usage
|
||||
-----
|
||||
|
||||
List all applications::
|
||||
|
||||
openstack appcatalog list
|
||||
|
||||
Show details for a specific application::
|
||||
|
||||
openstack appcatalog show "App Name"
|
||||
For any further questions, please email
|
||||
openstack-dev@lists.openstack.org or join #openstack-dev on
|
||||
Freenode.
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
|
||||
from oslo_utils import importutils
|
||||
|
||||
|
||||
def Client(version, *args, **kwargs):
|
||||
module = importutils.import_versioned_module('appcatalogclient',
|
||||
version, 'client')
|
||||
client_class = getattr(module, 'Client')
|
||||
return client_class(*args, **kwargs)
|
|
@ -1,49 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
import logging
|
||||
|
||||
from openstackclient.common import utils
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
DEFAULT_API_VERSION = '1'
|
||||
API_NAME = 'appcatalog'
|
||||
API_VERSION_OPTION = 'os_appcatalog_api_version'
|
||||
API_VERSIONS = {
|
||||
'1': 'appcatalogclient.v1.client.Client',
|
||||
}
|
||||
|
||||
|
||||
def make_client(instance):
|
||||
"""Returns an appcatalog service client."""
|
||||
plugin_client = utils.get_client_class(
|
||||
API_NAME,
|
||||
instance._api_version[API_NAME],
|
||||
API_VERSIONS)
|
||||
LOG.debug('Instantiating app catalog client: %s', plugin_client)
|
||||
client = plugin_client()
|
||||
return client
|
||||
|
||||
|
||||
def build_option_parser(parser):
|
||||
"""Hook to add global options."""
|
||||
parser.add_argument(
|
||||
'--os-appcatalog-api-version',
|
||||
metavar='<appcatalog-api-version>',
|
||||
help='App Catalog API version, default=' +
|
||||
DEFAULT_API_VERSION +
|
||||
' (Env: OS_APPCATALOG_API_VERSION)')
|
||||
return parser
|
|
@ -1,91 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
|
||||
import logging
|
||||
|
||||
from cliff import lister
|
||||
from cliff import show
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ListApps(lister.Lister):
|
||||
"""List all apps in the catalog."""
|
||||
|
||||
fields = ['Name', 'Type', 'License']
|
||||
fields_long = ['Name', 'Hash', 'Type', 'License']
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(ListApps, self).get_parser(prog_name)
|
||||
|
||||
parser.add_argument(
|
||||
'--long',
|
||||
action='store_true',
|
||||
default=False,
|
||||
help='List additional fields in output',
|
||||
)
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
client = self.app.client_manager.appcatalog
|
||||
catalog_json = client.catalog.get_apps()
|
||||
|
||||
if parsed_args.long:
|
||||
return (self.fields_long,
|
||||
((s['name'],
|
||||
s.get('hash', ''),
|
||||
s['service']['type'],
|
||||
s.get('license', '')) for s in catalog_json['assets'])
|
||||
)
|
||||
else:
|
||||
return (self.fields,
|
||||
((s['name'],
|
||||
s['service']['type'],
|
||||
s.get('license', '')) for s in catalog_json['assets'])
|
||||
)
|
||||
|
||||
|
||||
class ShowApp(show.ShowOne):
|
||||
"""Show details of one specific app."""
|
||||
|
||||
def _format_output(self, app):
|
||||
"""This function will change the output to a cleaner format."""
|
||||
fields, data = self.dict2columns(app)
|
||||
formatted_data = []
|
||||
for value in data:
|
||||
if isinstance(value, dict):
|
||||
dict_strings = []
|
||||
for key, val in value.items():
|
||||
dict_strings.append("{!s}={!s}".format(key, val))
|
||||
formatted_data.append('\n'.join(dict_strings))
|
||||
elif isinstance(value, list):
|
||||
formatted_data.append(', '.join(str(s) for s in value))
|
||||
else:
|
||||
formatted_data.append(value)
|
||||
|
||||
return fields, formatted_data
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(ShowApp, self).get_parser(prog_name)
|
||||
|
||||
parser.add_argument(
|
||||
'application',
|
||||
metavar="<application>",
|
||||
help='Name of the application',
|
||||
)
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
client = self.app.client_manager.appcatalog
|
||||
app = client.catalog.get_app(parsed_args.application)
|
||||
return self._format_output(app)
|
|
@ -1,20 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
|
||||
import testtools
|
||||
|
||||
|
||||
class BaseTestCase(testtools.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(BaseTestCase, self).setUp()
|
|
@ -1,22 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
|
||||
import mock
|
||||
from openstackclient.tests import utils
|
||||
|
||||
|
||||
class TestAppCatalog(utils.TestCommand):
|
||||
|
||||
def setUp(self):
|
||||
super(TestAppCatalog, self).setUp()
|
||||
self.app.client_manager.appcatalog = mock.Mock()
|
|
@ -1,94 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
|
||||
|
||||
from appcatalogclient.osc.v1 import catalog as osc_catalog
|
||||
from appcatalogclient.tests.unit.osc.v1 import fakes
|
||||
|
||||
FAKE_CATALOG = {'assets': [
|
||||
{'service': {'type': 'glance'},
|
||||
'hash': 'abcd',
|
||||
'name': 'Foo Bar',
|
||||
'license': 'test license'},
|
||||
{'service': {'type': 'glance'},
|
||||
'hash': 'efgh',
|
||||
'name': 'Test App',
|
||||
'license': 'test license'},
|
||||
{'service': {'type': 'heat'},
|
||||
'hash': 'ijkl',
|
||||
'name': 'Test App 2',
|
||||
'license': 'test license'}]}
|
||||
|
||||
|
||||
class TestCatalog(fakes.TestAppCatalog):
|
||||
|
||||
def setUp(self):
|
||||
super(TestCatalog, self).setUp()
|
||||
self.catalog_mock = self.app.client_manager.appcatalog.catalog
|
||||
self.catalog_mock.reset_mock()
|
||||
|
||||
|
||||
class TestListApps(TestCatalog):
|
||||
|
||||
def setUp(self):
|
||||
super(TestListApps, self).setUp()
|
||||
self.catalog_mock.get_apps.return_value = FAKE_CATALOG
|
||||
# Command to test
|
||||
self.cmd = osc_catalog.ListApps(self.app, None)
|
||||
|
||||
def test_list_apps(self):
|
||||
parsed_args = self.check_parser(self.cmd, [], [])
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
expected_columns = ['Name', 'Type', 'License']
|
||||
self.assertEqual(expected_columns, columns)
|
||||
|
||||
expected_data = [('Foo Bar', 'glance', 'test license'),
|
||||
('Test App', 'glance', 'test license'),
|
||||
('Test App 2', 'heat', 'test license')]
|
||||
self.assertEqual(expected_data, list(data))
|
||||
|
||||
def test_list_apps_long(self):
|
||||
parsed_args = self.check_parser(self.cmd, ['--long'], [])
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
expected_columns = ['Name', 'Hash', 'Type', 'License']
|
||||
self.assertEqual(expected_columns, columns)
|
||||
|
||||
expected_data = [('Foo Bar', 'abcd', 'glance', 'test license'),
|
||||
('Test App', 'efgh', 'glance', 'test license'),
|
||||
('Test App 2', 'ijkl', 'heat', 'test license')]
|
||||
self.assertEqual(expected_data, list(data))
|
||||
|
||||
|
||||
class TestShowApp(TestCatalog):
|
||||
|
||||
def setUp(self):
|
||||
super(TestShowApp, self).setUp()
|
||||
fake_app = {'service': {'type': 'glance'},
|
||||
'hash': 'abcd',
|
||||
'name': 'Foo Bar',
|
||||
'license': 'test license'}
|
||||
self.catalog_mock.get_app.return_value = fake_app
|
||||
# Command to test
|
||||
self.cmd = osc_catalog.ShowApp(self.app, None)
|
||||
|
||||
def test_get_app(self):
|
||||
parsed_args = self.check_parser(self.cmd, ['Foo Bar'], [])
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
expected_columns = ('hash', 'license', 'name', 'service')
|
||||
self.assertEqual(expected_columns, columns)
|
||||
|
||||
expected_data = ['abcd', 'test license', 'Foo Bar', 'type=glance']
|
||||
self.assertEqual(expected_data, data)
|
|
@ -1,54 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
|
||||
import requests_mock
|
||||
|
||||
from appcatalogclient.tests.unit import base
|
||||
from appcatalogclient.v1 import catalog
|
||||
|
||||
FAKE_CATALOG = {'assets': [
|
||||
{'service': {'type': 'glance'},
|
||||
'hash': 'abcd',
|
||||
'name': 'Foo Bar',
|
||||
'license': 'test license'},
|
||||
{'service': {'type': 'glance'},
|
||||
'hash': 'efgh',
|
||||
'name': 'Test App',
|
||||
'license': 'test license'},
|
||||
{'service': {'type': 'heat'},
|
||||
'hash': 'ijkl',
|
||||
'name': 'Test App 2',
|
||||
'license': 'test license'}]}
|
||||
|
||||
|
||||
class TestCatalogManager(base.BaseTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestCatalogManager, self).setUp()
|
||||
self.manager = catalog.CatalogManager('http://foo.bar/')
|
||||
|
||||
def test_list_apps(self):
|
||||
with requests_mock.mock() as m:
|
||||
m.get('http://foo.bar/assets', json=FAKE_CATALOG)
|
||||
response = self.manager.get_apps()
|
||||
self.assertEqual(FAKE_CATALOG, response)
|
||||
|
||||
def test_get_app(self):
|
||||
with requests_mock.mock() as m:
|
||||
m.get('http://foo.bar/assets', json=FAKE_CATALOG)
|
||||
result = self.manager.get_app('Test App')
|
||||
expected = {'service': {'type': 'glance'},
|
||||
'hash': 'efgh',
|
||||
'name': 'Test App',
|
||||
'license': 'test license'}
|
||||
self.assertEqual(expected, result)
|
|
@ -1,33 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
|
||||
import requests
|
||||
|
||||
|
||||
class CatalogManager(object):
|
||||
"""Manager for the app catalog."""
|
||||
|
||||
def __init__(self, api_url):
|
||||
self.catalog_url = api_url + 'assets'
|
||||
|
||||
def get_apps(self):
|
||||
"""Get all applications in the catalog."""
|
||||
response = requests.get(self.catalog_url)
|
||||
return response.json()
|
||||
|
||||
def get_app(self, app_name):
|
||||
"""Get details for a specific application given its name."""
|
||||
catalog = self.get_apps()
|
||||
for service in catalog['assets']:
|
||||
if app_name == service['name']:
|
||||
return service
|
|
@ -1,24 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
|
||||
from appcatalogclient.v1 import catalog
|
||||
|
||||
|
||||
class Client(object):
|
||||
"""Client for the App Catalog v1 API."""
|
||||
|
||||
API_URL = 'http://apps.openstack.org/api/v1/'
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""Initialize a new client for the App Catalog v1 API."""
|
||||
self.catalog = catalog.CatalogManager(self.API_URL)
|
|
@ -1,8 +0,0 @@
|
|||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
pbr>=1.6 # Apache-2.0
|
||||
cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
|
||||
python-openstackclient>=2.1.0 # Apache-2.0
|
||||
requests!=2.9.0,>=2.8.1 # Apache-2.0
|
||||
six>=1.9.0 # MIT
|
40
setup.cfg
40
setup.cfg
|
@ -1,40 +0,0 @@
|
|||
[metadata]
|
||||
name = python-appcatalogclient
|
||||
summary = OpenStack App Catalog API Client Library
|
||||
description-file = README.rst
|
||||
author = OpenStack
|
||||
author-email = openstack-dev@lists.openstack.org
|
||||
home-page = http://www.openstack.org/
|
||||
classifier =
|
||||
Environment :: OpenStack
|
||||
Intended Audience :: Information Technology
|
||||
Intended Audience :: System Administrators
|
||||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: POSIX :: Linux
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 2
|
||||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.4
|
||||
|
||||
[files]
|
||||
packages = appcatalogclient
|
||||
|
||||
[entry_points]
|
||||
openstack.cli.extension =
|
||||
appcatalog = appcatalogclient.osc.plugin
|
||||
|
||||
openstack.appcatalog.v1 =
|
||||
appcatalog_list = appcatalogclient.osc.v1.catalog:ListApps
|
||||
appcatalog_show = appcatalogclient.osc.v1.catalog:ShowApp
|
||||
|
||||
[pbr]
|
||||
autodoc_index_modules = True
|
||||
|
||||
[build_sphinx]
|
||||
all_files = 1
|
||||
build-dir = doc/build
|
||||
source-dir = doc/source
|
||||
|
||||
[wheel]
|
||||
universal = 1
|
28
setup.py
28
setup.py
|
@ -1,28 +0,0 @@
|
|||
#
|
||||
# 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.
|
||||
|
||||
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
|
||||
import setuptools
|
||||
|
||||
# In python < 2.7.4, a lazy loading of package `pbr` will break
|
||||
# setuptools if some other modules registered functions in `atexit`.
|
||||
# solution from: http://bugs.python.org/issue15881#msg170215
|
||||
try:
|
||||
import multiprocessing # noqa
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
setuptools.setup(
|
||||
setup_requires=['pbr>=1.8'],
|
||||
pbr=True)
|
|
@ -1,13 +0,0 @@
|
|||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
hacking<0.11,>=0.10.0
|
||||
coverage>=3.6 # Apache-2.0
|
||||
doc8 # Apache-2.
|
||||
fixtures>=1.3.1 # Apache-2.0/BSD
|
||||
requests-mock>=0.7.0 # Apache-2.0
|
||||
mock>=1.2 # BSD
|
||||
Babel>=1.3 # BSD
|
||||
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
|
||||
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||
testtools>=1.4.0 # MIT
|
41
tox.ini
41
tox.ini
|
@ -1,41 +0,0 @@
|
|||
[tox]
|
||||
minversion = 1.6
|
||||
envlist = py34,py27,pep8,pypy
|
||||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
LANGUAGE=en_US
|
||||
# .testr.conf uses TESTS_DIR
|
||||
TESTS_DIR=./appcatalogclient/tests/unit
|
||||
usedevelop = True
|
||||
install_command = pip install -U {opts} {packages}
|
||||
deps =
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = find . -type f -name "*.pyc" -delete
|
||||
python setup.py testr --testr-args='{posargs}'
|
||||
whitelist_externals = find
|
||||
|
||||
[testenv:releasenotes]
|
||||
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||
|
||||
[testenv:pep8]
|
||||
commands =
|
||||
flake8 {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
LANGUAGE=en_US
|
||||
commands =
|
||||
python setup.py testr --coverage {posargs}
|
||||
|
||||
[testenv:venv]
|
||||
commands = {posargs}
|
||||
|
||||
[flake8]
|
||||
ignore =
|
||||
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools
|
||||
|
||||
[hacking]
|
||||
import_exceptions = testtools.matchers
|
Loading…
Reference in New Issue