Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions SoftLayer/CLI/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@
('tags:list', 'SoftLayer.CLI.tags.list:cli'),
('tags:set', 'SoftLayer.CLI.tags.set:cli'),
('tags:details', 'SoftLayer.CLI.tags.details:cli'),
('tags:delete', 'SoftLayer.CLI.tags.delete:cli'),

('ticket', 'SoftLayer.CLI.ticket'),
('ticket:create', 'SoftLayer.CLI.ticket.create:cli'),
Expand Down
30 changes: 30 additions & 0 deletions SoftLayer/CLI/tags/delete.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
"""List Tags."""
# :license: MIT, see LICENSE for more details.

import click

from SoftLayer.exceptions import SoftLayerAPIError
from SoftLayer.managers.tags import TagManager
from SoftLayer.CLI import environment
from SoftLayer.CLI import formatting
from SoftLayer import utils

# pylint: disable=unnecessary-lambda

from pprint import pprint as pp


@click.command()
@click.option('-id', required=False, show_default=False, type=int, help='identifier')
@click.option('--name', required=False, default=False, type=str, show_default=False, help='tag name')
@environment.pass_env
def cli(env, id, name):
"""delete Tag."""

tag_manager = TagManager(env.client)

if not name and id is not None:
tag_name = tag_manager.get_tag(id)
tag_manager.delete_tag(tag_name['name'])
if name and id is None:
tag_manager.delete_tag(name)
2 changes: 2 additions & 0 deletions SoftLayer/fixtures/SoftLayer_Tag.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
}
]

deleteTag = True

setTags = True

getObject = getAttachedTagsForCurrentUser[0]
Expand Down
3 changes: 3 additions & 0 deletions SoftLayer/managers/tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ def reference_lookup(self, resource_table_id, tag_type):
# return {}
return self.client.call(service, 'getObject', id=resource_table_id)

def delete_tag(self, name):
return self.client.call('SoftLayer_Tag', 'deleteTag', name)

def set_tags(self, tags, key_name, resource_id):
"""Calls SoftLayer_Tag::setTags()

Expand Down
9 changes: 9 additions & 0 deletions tests/CLI/modules/tag_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import mock

from SoftLayer import testing
from SoftLayer.managers.tags import TagManager


class TagCLITests(testing.TestCase):
Expand Down Expand Up @@ -56,3 +57,11 @@ def test_details_by_id(self):
result = self.run_command(['tags', 'details', tag_id])
self.assert_no_fail(result)
self.assert_called_with('SoftLayer_Tag', 'getObject', identifier=tag_id)

def test_deleteTags_by_name(self):
result = self.run_command(['tags', 'delete', '--name="test"'])
self.assert_no_fail(result)

def test_deleteTags_by_id(self):
result = self.run_command(['tags', 'delete', '-id=123456'])
self.assert_no_fail(result)