diff --git a/ipf/glue2/types.py b/ipf/glue2/glue2types.py similarity index 100% rename from ipf/glue2/types.py rename to ipf/glue2/glue2types.py diff --git a/ipf/glue2/installedservices.py b/ipf/glue2/installedservices.py index 4ff1ca1..87d292b 100644 --- a/ipf/glue2/installedservices.py +++ b/ipf/glue2/installedservices.py @@ -25,7 +25,7 @@ #from . import endpoint from .step import GlueStep #from .step import computing_service -from .types import AppEnvState, ApplicationHandle +from .glue2types import AppEnvState, ApplicationHandle from . import computing_activity from . import computing_manager from . import computing_service diff --git a/ipf/glue2/modules.py b/ipf/glue2/modules.py index 2b18cb6..30ddd38 100644 --- a/ipf/glue2/modules.py +++ b/ipf/glue2/modules.py @@ -24,7 +24,7 @@ from ipf.urnprefix import IPF_URN_PREFIX from . import application from . import service -from .types import AppEnvState, ApplicationHandle +from .glue2types import AppEnvState, ApplicationHandle ####################################################################################################################### diff --git a/ipf/glue2/openstack.py b/ipf/glue2/openstack.py index 06fec9f..59c9b01 100644 --- a/ipf/glue2/openstack.py +++ b/ipf/glue2/openstack.py @@ -34,7 +34,7 @@ import glue2.computing_service import glue2.computing_share import glue2.execution_environment -import glue2.types +import glue2.glue2types from . import accelerator_environment from . import computing_manager_accel_info @@ -412,9 +412,9 @@ def _addImage(self, image, apps): # env.Description = ??? # env.Repository = if image.status == "ACTIVE": - env.State = glue2.types.AppEnvState.INSTALLED_NOT_VERIFIED + env.State = glue2.glue2types.AppEnvState.INSTALLED_NOT_VERIFIED elif image.status == "SAVING": - env.State = glue2.types.AppEnvState.INSTALLABLE + env.State = glue2.glue2types.AppEnvState.INSTALLABLE else: self.warning("unknown image status: "+image.status) env.Extension["Updated"] = image.updated diff --git a/ipf/glue2/valet.py b/ipf/glue2/valet.py index 19e38e4..5015d5f 100644 --- a/ipf/glue2/valet.py +++ b/ipf/glue2/valet.py @@ -24,7 +24,7 @@ from ipf.error import StepError from ipf.urnprefix import IPF_URN_PREFIX from . import application -from .types import AppEnvState, ApplicationHandle +from .glue2types import AppEnvState, ApplicationHandle #######################################################################################################################