From b10d2cbbc1b051d50892b17d1ded4feaf9612360 Mon Sep 17 00:00:00 2001 From: "Jay Lau (Guangya Liu)" Date: Wed, 31 Dec 2014 02:19:43 -0500 Subject: [PATCH] Remove get_service_by_instance k8s is a logic concept and it does not bind to any instance Change-Id: I4bfb1940c681a133d6a5257c3abe2a8661fca67b --- magnum/db/api.py | 8 -------- magnum/db/sqlalchemy/api.py | 14 -------------- 2 files changed, 22 deletions(-) diff --git a/magnum/db/api.py b/magnum/db/api.py index 2fc1d89c6a..fc15520174 100644 --- a/magnum/db/api.py +++ b/magnum/db/api.py @@ -664,14 +664,6 @@ class Connection(object): :returns: A service. """ - @abc.abstractmethod - def get_service_by_instance(self, instance): - """Return a service. - - :param instance: The instance name or uuid to search for. - :returns: A service. - """ - @abc.abstractmethod def destroy_service(self, service_id): """Destroy a service and all associated interfaces. diff --git a/magnum/db/sqlalchemy/api.py b/magnum/db/sqlalchemy/api.py index 22b2e20d91..98fa0a872c 100644 --- a/magnum/db/sqlalchemy/api.py +++ b/magnum/db/sqlalchemy/api.py @@ -1120,20 +1120,6 @@ class Connection(api.Connection): except NoResultFound: raise exception.ServiceNotFound(bay=bay_uuid) - def get_service_by_instance(self, instance): - if not utils.is_uuid_like(instance): - raise exception.InvalidUUID(uuid=instance) - - query = (model_query(models.Service) - .filter_by(instance_uuid=instance)) - - try: - result = query.one() - except NoResultFound: - raise exception.InstanceNotFound(instance=instance) - - return result - def destroy_service(self, service_id): session = get_session() with session.begin():