diff --git a/designate/objects/__init__.py b/designate/objects/__init__.py index 7b67b86c1..1a3c6c9b8 100644 --- a/designate/objects/__init__.py +++ b/designate/objects/__init__.py @@ -32,7 +32,6 @@ from designate.objects.pool_target_option import PoolTargetOption, PoolTargetOpt from designate.objects.quota import Quota, QuotaList # noqa from designate.objects.record import Record, RecordList # noqa from designate.objects.recordset import RecordSet, RecordSetList # noqa -from designate.objects.server import Server, ServerList # noqa from designate.objects.service_status import ServiceStatus, ServiceStatusList # noqa from designate.objects.shared_zone import SharedZone, SharedZoneList # noqa from designate.objects.tenant import Tenant, TenantList # noqa diff --git a/designate/objects/server.py b/designate/objects/server.py deleted file mode 100644 index 6d4d5677f..000000000 --- a/designate/objects/server.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) 2014 Rackspace Hosting -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -from designate.objects import base -from designate.objects import fields - - -@base.DesignateRegistry.register -class Server(base.DictObjectMixin, base.PersistentObjectMixin, - base.DesignateObject): - def __init__(self, *args, **kwargs): - super(Server, self).__init__(*args, **kwargs) - - fields = { - 'name': fields.DomainField(maxLength=255), - } - - STRING_KEYS = [ - 'id', 'name' - ] - - -@base.DesignateRegistry.register -class ServerList(base.ListObjectMixin, base.DesignateObject): - LIST_ITEM_TYPE = Server - - fields = { - 'objects': fields.ListOfObjectsField('Server'), - } diff --git a/doc/source/contributor/sourcedoc/objects.rst b/doc/source/contributor/sourcedoc/objects.rst index fed275ec2..ae317a240 100644 --- a/doc/source/contributor/sourcedoc/objects.rst +++ b/doc/source/contributor/sourcedoc/objects.rst @@ -60,14 +60,6 @@ Objects Recordset :show-inheritance: -Objects Server -============== -.. automodule:: designate.objects.server - :members: - :undoc-members: - :show-inheritance: - - Objects Tenant ============== .. automodule:: designate.objects.tenant