projectatomic/atomic
1
0
Fork 0
mirror of https://github.com/projectatomic/atomic.git synced 2026-02-05 18:45:01 +01:00
Code Issues Releases Activity

dbus: support storage argument for ImagesDelete

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #958
Approved by: rhatdan
This commit is contained in:
Giuseppe Scrivano
2017-04-02 17:42:45 +02:00
committed by Atomic Bot
parent 0b68e22d5e
commit b4d359808f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
atomic_dbus.py
View File

@@ -246,13 +246,14 @@ class atomic_dbus(slip.dbus.service.Object):
# atomic containers section
# The ImagesDelete method will delete one or more images on the system.
@slip.dbus.polkit.require_auth("org.atomic.readwrite")
@dbus.service.method("org.atomic", in_signature='asbb', out_signature='i')
def ImagesDelete(self, images, force, remote):
@dbus.service.method("org.atomic", in_signature='asbbs', out_signature='i')
def ImagesDelete(self, images, force, remote, storage):
i = Delete()
args = self.Args()
args.delete_targets = images
args.remote = remote
args.force = force
args.storage = storage
args.assumeyes = True
i.set_args(args)
return i.delete_image()

4
atomic_dbus_client.py
View File

@@ -68,10 +68,10 @@ class AtomicDBus (object):
return ret
@polkit.enable_proxy
def ImagesDelete(self, images, force=False, remote=False):
def ImagesDelete(self, images, force=False, remote=False, storage='docker'):
if not isinstance(images, (list, tuple)):
images = [ images ]
return self.dbus_object.ImagesDelete(images, force, remote, dbus_interface="org.atomic")
return self.dbus_object.ImagesDelete(images, force, remote, storage, dbus_interface="org.atomic")
@polkit.enable_proxy
def ImagesHelp(self, image):