Add package delete to openstack CLI
usage: openstack package delete [-h] [-f {csv,json,table,value,yaml}]
[-c COLUMN] [--max-width <integer>]
[--noindent]
[--quote {all,minimal,none,nonnumeric}]
<ID> [<ID> ...]
Delete a package.
Partially implements: blueprint openstack-client-plugin-support
Change-Id: Ie92f542d3b09a57f60352de015b93ee2cbe6f67c
This commit is contained in:
zhurong
parent
12c70b72d0
commit
0c844b08e1
|
|
@ -274,3 +274,49 @@ class ListPackages(command.Lister):
|
|||
columns,
|
||||
) for s in itertools.islice(data, parsed_args.limit))
|
||||
)
|
||||
|
||||
|
||||
class DeletePackage(command.Lister):
|
||||
"""Delete a package."""
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(DeletePackage, self).get_parser(prog_name)
|
||||
parser.add_argument(
|
||||
'id',
|
||||
metavar="<ID>",
|
||||
nargs="+",
|
||||
help="Package ID to delete.",
|
||||
)
|
||||
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
LOG.debug("take_action({0})".format(parsed_args))
|
||||
|
||||
client = self.app.client_manager.application_catalog
|
||||
|
||||
failure_count = 0
|
||||
for package_id in parsed_args.id:
|
||||
try:
|
||||
client.packages.delete(package_id)
|
||||
except exceptions.NotFound:
|
||||
failure_count += 1
|
||||
print("Failed to delete '{0}'; package not found".
|
||||
format(package_id))
|
||||
|
||||
if failure_count == len(parsed_args.id):
|
||||
raise exceptions.CommandError("Unable to find and delete any of "
|
||||
"the specified packages.")
|
||||
data = client.packages.filter()
|
||||
|
||||
columns = ('id', 'name', 'fully_qualified_name', 'author', 'active',
|
||||
'is public', 'type', 'version')
|
||||
column_headers = [c.capitalize() for c in columns]
|
||||
|
||||
return (
|
||||
column_headers,
|
||||
list(utils.get_item_properties(
|
||||
s,
|
||||
columns,
|
||||
) for s in data)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -28,6 +28,26 @@ from osc_lib import utils
|
|||
FIXTURE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
||||
'fixture_data'))
|
||||
|
||||
COLUMNS = ['Id', 'Name', 'Fully_qualified_name', 'Author', 'Active',
|
||||
'Is public', 'Type', 'Version']
|
||||
|
||||
DATA = {
|
||||
'class_definitions': ['com.example.apache.ApacheHttpServer'],
|
||||
'updated': '2016-09-20T06:23:45.000000',
|
||||
'description': 'Test description.\n',
|
||||
'created': '2016-09-20T06:23:15.000000',
|
||||
'author': 'Mirantis, Inc',
|
||||
'enabled': True,
|
||||
'owner_id': 'a203405ea871484a940850d6c0b8dfd9',
|
||||
'tags': ['Server', 'WebServer', 'Apache', 'HTTP', 'HTML'],
|
||||
'is_public': False,
|
||||
'fully_qualified_name': 'com.example.apache.ApacheHttpServer',
|
||||
'type': 'Application',
|
||||
'id': '46860070-5f8a-4936-96e8-d7b89e5187d7',
|
||||
'categories': [],
|
||||
'name': 'Apache HTTP Server'
|
||||
}
|
||||
|
||||
|
||||
class TestPackage(fakes.TestApplicationCatalog):
|
||||
def setUp(self):
|
||||
|
|
@ -108,31 +128,11 @@ class TestCreatePackage(TestPackage):
|
|||
|
||||
class TestPackageList(TestPackage):
|
||||
|
||||
columns = ['Id', 'Name', 'Fully_qualified_name', 'Author', 'Active',
|
||||
'Is public', 'Type', 'Version']
|
||||
|
||||
data = {
|
||||
'class_definitions': ['com.example.apache.ApacheHttpServer'],
|
||||
'updated': '2016-09-20T06:23:45.000000',
|
||||
'description': 'Test description.\n',
|
||||
'created': '2016-09-20T06:23:15.000000',
|
||||
'author': 'Mirantis, Inc',
|
||||
'enabled': True,
|
||||
'owner_id': 'a203405ea871484a940850d6c0b8dfd9',
|
||||
'tags': ['Server', 'WebServer', 'Apache', 'HTTP', 'HTML'],
|
||||
'is_public': False,
|
||||
'fully_qualified_name': 'com.example.apache.ApacheHttpServer',
|
||||
'type': 'Application',
|
||||
'id': '46860070-5f8a-4936-96e8-d7b89e5187d7',
|
||||
'categories': [],
|
||||
'name': 'Apache HTTP Server'
|
||||
}
|
||||
|
||||
def setUp(self):
|
||||
super(TestPackageList, self).setUp()
|
||||
self.cmd = osc_pkg.ListPackages(self.app, None)
|
||||
self.package_mock.filter.return_value = \
|
||||
[packages.Package(None, self.data)]
|
||||
[packages.Package(None, DATA)]
|
||||
utils.get_dict_properties = mock.MagicMock(return_value='')
|
||||
|
||||
def test_stack_list_defaults(self):
|
||||
|
|
@ -144,7 +144,7 @@ class TestPackageList(TestPackage):
|
|||
self.package_mock.filter.assert_called_with(
|
||||
include_disabled=False,
|
||||
owned=False)
|
||||
self.assertEqual(self.columns, columns)
|
||||
self.assertEqual(COLUMNS, columns)
|
||||
|
||||
def test_stack_list_with_limit(self):
|
||||
arglist = ['--limit', '10']
|
||||
|
|
@ -189,3 +189,36 @@ class TestPackageList(TestPackage):
|
|||
include_disabled=False,
|
||||
fqn='mysql',
|
||||
owned=False)
|
||||
|
||||
|
||||
class TestPackageDelete(TestPackage):
|
||||
def setUp(self):
|
||||
super(TestPackageDelete, self).setUp()
|
||||
self.package_mock.delete.return_value = None
|
||||
self.package_mock.filter.return_value = \
|
||||
[packages.Package(None, DATA)]
|
||||
|
||||
# Command to test
|
||||
self.cmd = osc_pkg.DeletePackage(self.app, None)
|
||||
|
||||
@mock.patch('osc_lib.utils.get_item_properties')
|
||||
def test_package_delete(self, mock_util):
|
||||
arglist = ['fake1']
|
||||
verifylist = [('id', ['fake1'])]
|
||||
|
||||
mock_util.return_value = ('1234', 'Core library',
|
||||
'io.murano', 'murano.io', '',
|
||||
'True', 'Library', '0.0.0'
|
||||
)
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
columns, data = self.cmd.take_action(parsed_args)
|
||||
|
||||
# Check that columns are correct
|
||||
self.assertEqual(COLUMNS, columns)
|
||||
|
||||
# Check that data is correct
|
||||
expected_data = [('1234', 'Core library', 'io.murano',
|
||||
'murano.io', '', 'True', 'Library', '0.0.0')]
|
||||
self.assertEqual(expected_data, data)
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ openstack.application_catalog.v1 =
|
|||
|
||||
package_create = muranoclient.osc.v1.package:CreatePackage
|
||||
package_list = muranoclient.osc.v1.package:ListPackages
|
||||
package_delete = muranoclient.osc.v1.package:DeletePackage
|
||||
|
||||
static-action_call = muranoclient.osc.v1.action:StaticActionCall
|
||||
class-schema = muranoclient.osc.v1.schema:ShowSchema
|
||||
|
|
|
|||
Loading…
Reference in New Issue