diff --git a/wrapanapi/__init__.py b/wrapanapi/__init__.py index cdae110b..c6c1db54 100644 --- a/wrapanapi/__init__.py +++ b/wrapanapi/__init__.py @@ -1,7 +1,7 @@ # Imports for convenience from .entities.vm import VmState -from .systems.container.rhopenshift import Openshift from .systems.container.podman import Podman +from .systems.container.rhopenshift import Openshift from .systems.ec2 import EC2System from .systems.google import GoogleCloudSystem from .systems.hawkular import HawkularSystem diff --git a/wrapanapi/systems/container/__init__.py b/wrapanapi/systems/container/__init__.py index 7aaba37b..d1ed72ec 100644 --- a/wrapanapi/systems/container/__init__.py +++ b/wrapanapi/systems/container/__init__.py @@ -1,4 +1,4 @@ -from .rhopenshift import Openshift from .podman import Podman +from .rhopenshift import Openshift __all__ = ["Openshift", "Podman"] diff --git a/wrapanapi/systems/container/podman.py b/wrapanapi/systems/container/podman.py index 50aa5713..6ea8fc16 100644 --- a/wrapanapi/systems/container/podman.py +++ b/wrapanapi/systems/container/podman.py @@ -1,16 +1,14 @@ from abc import ABCMeta +from datetime import datetime from podman import PodmanClient from proto.utils import cached_property -from datetime import datetime -from wrapanapi.systems.base import System from wrapanapi.entities.base import Entity -from abc import ABCMeta +from wrapanapi.systems.base import System class PodmanContainer(Entity, metaclass=ABCMeta): - def __init__(self, system, raw=None, **kwargs): """ Constructor for an PodmanContainer tied to a specific host. @@ -45,7 +43,7 @@ def uuid(self): @property def creation_time(self): - return datetime.fromisoformat(self.raw.attrs['Created']) + return datetime.fromisoformat(self.raw.attrs["Created"]) def delete(self, force=False): return self.raw.remove(force=force) @@ -63,7 +61,6 @@ def refresh(self): class Podman(System): - def __init__( self, hostname, username, protocol="http+ssh", port=22, verify_ssl=False, **kwargs ): @@ -105,9 +102,7 @@ def containers(self): """Returns list of containers""" conInstance = [] for cont in self.containers_collection.list(): - conInstance.append( - PodmanContainer(system=self, name=cont.name, id=cont.id, raw=cont) - ) + conInstance.append(PodmanContainer(system=self, name=cont.name, id=cont.id, raw=cont)) return conInstance def get_container(self, key):