diff --git a/magnum/db/api.py b/magnum/db/api.py index fddd12253f..179e81c877 100644 --- a/magnum/db/api.py +++ b/magnum/db/api.py @@ -593,14 +593,6 @@ class Connection(object): :returns: A list of tuples of the specified columns. """ - @abc.abstractmethod - def get_rcs_by_bay_uuid(self, bay_uuid): - """List all the ReplicationControllers for a given bay. - - :param bay_uuid: The uuid of a bay. - :returns: A list of ReplicationControllers. - """ - @abc.abstractmethod def create_rc(self, values): """Create a new ReplicationController. diff --git a/magnum/db/sqlalchemy/api.py b/magnum/db/sqlalchemy/api.py index edc786c986..1fe3011e1d 100644 --- a/magnum/db/sqlalchemy/api.py +++ b/magnum/db/sqlalchemy/api.py @@ -881,16 +881,6 @@ class Connection(api.Connection): except NoResultFound: raise exception.ReplicationControllerNotFound(rc=rc_uuid) - def get_rcs_by_bay_uuid(self, context, bay_uuid): - # First verify whether the Bay exists - self.get_bay_by_uuid(context, bay_uuid) - query = model_query(models.ReplicationController).filter_by( - bay_uuid=bay_uuid) - try: - return query.all() - except NoResultFound: - raise exception.ReplicationControllerNotFound(bay=bay_uuid) - def get_rc_by_name(self, context, rc_name): query = model_query(models.ReplicationController) query = self._add_tenant_filters(context, query) diff --git a/magnum/tests/unit/db/test_replicationcontroller.py b/magnum/tests/unit/db/test_replicationcontroller.py index 7d71640075..3dde3c1b9d 100644 --- a/magnum/tests/unit/db/test_replicationcontroller.py +++ b/magnum/tests/unit/db/test_replicationcontroller.py @@ -105,17 +105,6 @@ class DbRCTestCase(base.DbTestCase): 'bay_uuid': magnum_utils.generate_uuid()}) self.assertEqual(0, len(rc)) - def test_get_rcs_by_bay_uuid(self): - rc = self.dbapi.get_rcs_by_bay_uuid(self.context, - self.bay.uuid) - self.assertEqual(self.rc.id, rc[0].id) - - def test_get_rcs_by_bay_uuid_that_does_not_exist(self): - self.assertRaises(exception.BayNotFound, - self.dbapi.get_rcs_by_bay_uuid, - self.context, - magnum_utils.generate_uuid()) - def test_destroy_rc(self): self.dbapi.destroy_rc(self.rc.id) self.assertRaises(exception.ReplicationControllerNotFound,