x/python-tatuclient
Code Issues Proposed changes

Rename Moniker -> Designate

Browse Source 
Change-Id: Idf7153aa287adc874a2878dc829950fda52a4879
This commit is contained in:
Kiall Mac Innes 2013-06-09 21:18:36 +01:00
parent dbd8617122
commit 67c14f0573
33 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -19,5 +19,5 @@ ChangeLog
doc/source/api/* doc/source/api/*
doc/build/* doc/build/*
dist dist
monikerclient/versioninfo designateclient/versioninfo
.testrepository .testrepository

2
.testr.conf
View File

@ -1,4 +1,4 @@
[DEFAULT] [DEFAULT]
test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./monikerclient/tests $LISTOPT $IDOPTION test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./designateclient/tests $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE test_id_option=--load-list $IDFILE
test_list_option=--list test_list_option=--list

4
MANIFEST.in
View File

@ -1,8 +1,8 @@
include AUTHORS include AUTHORS
include ChangeLog include ChangeLog
include monikerclient/versioninfo include designateclient/versioninfo
include *.txt *.ini *.cfg *.rst *.md include *.txt *.ini *.cfg *.rst *.md
recursive-include monikerclient/resources * recursive-include designateclient/resources *
recursive-include tools * recursive-include tools *
exclude .gitignore exclude .gitignore

4
bin/moniker → bin/designate
View File

@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import sys import sys
from monikerclient.shell import MonikerShell from designateclient.shell import DesignateShell
shell = MonikerShell() shell = DesignateShell()
sys.exit(shell.run(sys.argv[1:])) sys.exit(shell.run(sys.argv[1:]))

0
monikerclient/__init__.py → designateclient/__init__.py
View File

2
monikerclient/auth.py → designateclient/auth.py
View File

@ -49,7 +49,7 @@ class KeystoneAuth(AuthBase):
request.headers['X-Auth-Token'] = self.token request.headers['X-Auth-Token'] = self.token
if self.sudo_tenant_id: if self.sudo_tenant_id:
request.headers['X-Moniker-Sudo-Tenant-ID'] = self.sudo_tenant_id request.headers['X-Designate-Sudo-Tenant-ID'] = self.sudo_tenant_id
return request return request

0
monikerclient/cli/__init__.py → designateclient/cli/__init__.py
View File

6
monikerclient/cli/base.py → designateclient/cli/base.py
View File

@ -17,9 +17,9 @@ import abc
from cliff.command import Command as CliffCommand from cliff.command import Command as CliffCommand
from cliff.lister import Lister from cliff.lister import Lister
from cliff.show import ShowOne from cliff.show import ShowOne
from monikerclient import exceptions from designateclient import exceptions
from monikerclient import utils from designateclient import utils
from monikerclient.v1 import Client from designateclient.v1 import Client
class Command(CliffCommand): class Command(CliffCommand):

2
monikerclient/cli/diagnostics.py → designateclient/cli/diagnostics.py
View File

@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import logging import logging
from monikerclient.cli import base from designateclient.cli import base
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

4
monikerclient/cli/domains.py → designateclient/cli/domains.py
View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import logging import logging
from monikerclient.cli import base from designateclient.cli import base
from monikerclient.v1.domains import Domain from designateclient.v1.domains import Domain
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

4
monikerclient/cli/records.py → designateclient/cli/records.py
View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import logging import logging
from monikerclient.cli import base from designateclient.cli import base
from monikerclient.v1.records import Record from designateclient.v1.records import Record
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
monikerclient/cli/reports.py → designateclient/cli/reports.py
View File

@ -13,7 +13,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from monikerclient.cli import base from designateclient.cli import base
class DomainCountCommand(base.GetCommand): class DomainCountCommand(base.GetCommand):

4
monikerclient/cli/servers.py → designateclient/cli/servers.py
View File

@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import logging import logging
from monikerclient.cli import base from designateclient.cli import base
from monikerclient.v1.servers import Server from designateclient.v1.servers import Server
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

0
monikerclient/exceptions.py → designateclient/exceptions.py
View File

0
monikerclient/resources/schemas/v1/domain.json → designateclient/resources/schemas/v1/domain.json
View File

0
monikerclient/resources/schemas/v1/record.json → designateclient/resources/schemas/v1/record.json
View File

0
monikerclient/resources/schemas/v1/server.json → designateclient/resources/schemas/v1/server.json
View File

18
monikerclient/shell.py → designateclient/shell.py
View File

@ -17,23 +17,23 @@ import logging
import os import os
from cliff.app import App from cliff.app import App
from cliff.commandmanager import CommandManager from cliff.commandmanager import CommandManager
from monikerclient.version import version_info as version from designateclient.version import version_info as version
class MonikerShell(App): class DesignateShell(App):
CONSOLE_MESSAGE_FORMAT = '%(levelname)s: %(message)s' CONSOLE_MESSAGE_FORMAT = '%(levelname)s: %(message)s'
def __init__(self): def __init__(self):
super(MonikerShell, self).__init__( super(DesignateShell, self).__init__(
description='Moniker Client', description='Designate Client',
version=version.version_string(), version=version.version_string(),
command_manager=CommandManager('monikerclient.cli'), command_manager=CommandManager('designateclient.cli'),
) )
self.log = logging.getLogger(__name__) self.log = logging.getLogger(__name__)
def configure_logging(self): def configure_logging(self):
super(MonikerShell, self).configure_logging() super(DesignateShell, self).configure_logging()
# Set requests logging # Set requests logging
requests_logger = logging.getLogger('requests') requests_logger = logging.getLogger('requests')
@ -44,7 +44,7 @@ class MonikerShell(App):
requests_logger.setLevel(logging.DEBUG) requests_logger.setLevel(logging.DEBUG)
def build_option_parser(self, description, version): def build_option_parser(self, description, version):
parser = super(MonikerShell, self).build_option_parser( parser = super(DesignateShell, self).build_option_parser(
description, version) description, version)
parser.add_argument('--os-endpoint', parser.add_argument('--os-endpoint',
@ -86,7 +86,7 @@ class MonikerShell(App):
help="Defaults to env[OS_REGION_NAME]") help="Defaults to env[OS_REGION_NAME]")
parser.add_argument('--sudo-tenant-id', parser.add_argument('--sudo-tenant-id',
default=os.environ.get('MONIKER_SUDO_TENANT_ID'), default=os.environ.get('DESIGNATE_SUDO_TENANT_ID'),
help="Defaults to env[MONIKER_SUDO_TENANT_ID]") help="Defaults to env[DESIGNATE_SUDO_TENANT_ID]")
return parser return parser

0
monikerclient/tests/__init__.py → designateclient/tests/__init__.py
View File

4
monikerclient/utils.py → designateclient/utils.py
View File

@ -16,7 +16,7 @@
import os import os
import pkg_resources import pkg_resources
import json import json
from monikerclient import exceptions from designateclient import exceptions
def resource_string(*args, **kwargs): def resource_string(*args, **kwargs):
@ -26,7 +26,7 @@ def resource_string(*args, **kwargs):
package = kwargs.pop('package', None) package = kwargs.pop('package', None)
if not package: if not package:
package = 'monikerclient' package = 'designateclient'
resource_path = os.path.join('resources', *args) resource_path = os.path.join('resources', *args)

8
monikerclient/v1/__init__.py → designateclient/v1/__init__.py
View File

@ -15,12 +15,12 @@
# under the License. # under the License.
import requests import requests
from stevedore import extension from stevedore import extension
from monikerclient import exceptions from designateclient import exceptions
from monikerclient.auth import KeystoneAuth from designateclient.auth import KeystoneAuth
class Client(object): class Client(object):
""" Client for the Moniker v1 API """ """ Client for the Designate v1 API """
def __init__(self, endpoint=None, auth_url=None, username=None, def __init__(self, endpoint=None, auth_url=None, username=None,
password=None, tenant_id=None, tenant_name=None, token=None, password=None, tenant_id=None, tenant_name=None, token=None,
@ -61,7 +61,7 @@ class Client(object):
setattr(self, ext.name, controller) setattr(self, ext.name, controller)
# Load all controllers # Load all controllers
mgr = extension.ExtensionManager('monikerclient.v1.controllers') mgr = extension.ExtensionManager('designateclient.v1.controllers')
mgr.map(_load_controller) mgr.map(_load_controller)
def wrap_api_call(self, func, *args, **kw): def wrap_api_call(self, func, *args, **kw):

0
monikerclient/v1/base.py → designateclient/v1/base.py
View File

2
monikerclient/v1/diagnostics.py → designateclient/v1/diagnostics.py
View File

@ -13,7 +13,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from monikerclient.v1.base import Controller from designateclient.v1.base import Controller
class DiagnosticsController(Controller): class DiagnosticsController(Controller):

6
monikerclient/v1/domains.py → designateclient/v1/domains.py
View File

@ -14,9 +14,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json import json
from monikerclient import warlock from designateclient import warlock
from monikerclient import utils from designateclient import utils
from monikerclient.v1.base import CrudController from designateclient.v1.base import CrudController
Domain = warlock.model_factory(utils.load_schema('v1', 'domain')) Domain = warlock.model_factory(utils.load_schema('v1', 'domain'))

8
monikerclient/v1/records.py → designateclient/v1/records.py
View File

@ -14,10 +14,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json import json
from monikerclient import warlock from designateclient import warlock
from monikerclient import utils from designateclient import utils
from monikerclient.v1.base import CrudController from designateclient.v1.base import CrudController
from monikerclient.v1.domains import Domain from designateclient.v1.domains import Domain
Record = warlock.model_factory(utils.load_schema('v1', 'record')) Record = warlock.model_factory(utils.load_schema('v1', 'record'))

2
monikerclient/v1/reports.py → designateclient/v1/reports.py
View File

@ -13,7 +13,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from monikerclient.v1.base import Controller from designateclient.v1.base import Controller
class ReportsController(Controller): class ReportsController(Controller):

6
monikerclient/v1/servers.py → designateclient/v1/servers.py
View File

@ -14,9 +14,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json import json
from monikerclient import warlock from designateclient import warlock
from monikerclient import utils from designateclient import utils
from monikerclient.v1.base import CrudController from designateclient.v1.base import CrudController
Server = warlock.model_factory(utils.load_schema('v1', 'server')) Server = warlock.model_factory(utils.load_schema('v1', 'server'))

2
monikerclient/version.py → designateclient/version.py
View File

@ -15,4 +15,4 @@
# under the License. # under the License.
import pbr.version import pbr.version
version_info = pbr.version.VersionInfo('python-monikerclient') version_info = pbr.version.VersionInfo('python-designateclient')

0
monikerclient/warlock.py → designateclient/warlock.py
View File

20
doc/source/conf.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# monikerclient documentation build configuration file, created by # designateclient documentation build configuration file, created by
# sphinx-quickstart on Wed Oct 31 18:58:17 2012. # sphinx-quickstart on Wed Oct 31 18:58:17 2012.
# #
# This file is execfile()d with the current directory set to its containing dir. # This file is execfile()d with the current directory set to its containing dir.
@ -40,7 +40,7 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = u'monikerclient' project = u'designateclient'
copyright = u'2012, Managed I.T.' copyright = u'2012, Managed I.T.'
# The version info for the project you're documenting, acts as replacement for # The version info for the project you're documenting, acts as replacement for
@ -48,10 +48,10 @@ copyright = u'2012, Managed I.T.'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
from monikerclient.version import version_info as monikerclient_version from designateclient.version import version_info as designateclient_version
version = monikerclient_version.canonical_version_string() version = designateclient_version.canonical_version_string()
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = monikerclient_version.version_string_with_vcs() release = designateclient_version.version_string_with_vcs()
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
@ -165,7 +165,7 @@ html_static_path = ['_static']
#html_file_suffix = None #html_file_suffix = None
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = 'monikerclientdoc' htmlhelp_basename = 'designateclientdoc'
# -- Options for LaTeX output -------------------------------------------------- # -- Options for LaTeX output --------------------------------------------------
@ -184,7 +184,7 @@ latex_elements = {
# Grouping the document tree into LaTeX files. List of tuples # Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]). # (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [ latex_documents = [
('index', 'monikerclient.tex', u'Moniker Client Documentation', ('index', 'designateclient.tex', u'Designate Client Documentation',
u'Managed I.T.', 'manual'), u'Managed I.T.', 'manual'),
] ]
@ -214,7 +214,7 @@ latex_documents = [
# One entry per manual page. List of tuples # One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section). # (source start file, name, description, authors, manual section).
man_pages = [ man_pages = [
('index', 'monikerclient', u'Moniker Client Documentation', ('index', 'designateclient', u'Designate Client Documentation',
[u'Managed I.T.'], 1) [u'Managed I.T.'], 1)
] ]
@ -228,8 +228,8 @@ man_pages = [
# (source start file, target name, title, author, # (source start file, target name, title, author,
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ texinfo_documents = [
('index', 'monikerclient', u'Moniker Client Documentation', ('index', 'designateclient', u'Designate Client Documentation',
u'Managed I.T.', 'monikerclient', 'One line description of project.', u'Managed I.T.', 'designateclient', 'One line description of project.',
'Miscellaneous'), 'Miscellaneous'),
] ]

4
doc/source/index.rst
View File

@ -1,9 +1,9 @@
.. moniker documentation master file, created by .. designate documentation master file, created by
sphinx-quickstart on Wed Oct 31 18:58:17 2012. sphinx-quickstart on Wed Oct 31 18:58:17 2012.
You can adapt this file completely to your liking, but it should at least You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive. contain the root `toctree` directive.
Welcome to monikerclients's documentation! Welcome to designateclients's documentation!
=================================== ===================================
Contents: Contents:

0
python-monikerclient.sublime-project → python-designateclient.sublime-project
View File

86
setup.cfg
View File

@ -1,12 +1,12 @@
[metadata] [metadata]
name = python-monikerclient name = python-designateclient
version = 2013.1 version = 2013.1
summary = DNS as a Service - Client summary = DNS as a Service - Client
description-file = description-file =
README.rst README.rst
author = Kiall Mac Innes author = Kiall Mac Innes
author-email = kiall@managedit.ie author-email = kiall@managedit.ie
home-page = https://launchpad.net/python-monikerclientclient home-page = https://launchpad.net/python-designateclientclient
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology
@ -25,49 +25,49 @@ setup-hooks =
[files] [files]
packages = packages =
monikerclient designateclient
scripts = scripts =
bin/moniker bin/designate
[entry_points] [entry_points]
monikerclient.v1.controllers = designateclient.v1.controllers =
reports = monikerclient.v1.reports:ReportsController reports = designateclient.v1.reports:ReportsController
diagnostics = monikerclient.v1.diagnostics:DiagnosticsController diagnostics = designateclient.v1.diagnostics:DiagnosticsController
domains = monikerclient.v1.domains:DomainsController domains = designateclient.v1.domains:DomainsController
records = monikerclient.v1.records:RecordsController records = designateclient.v1.records:RecordsController
servers = monikerclient.v1.servers:ServersController servers = designateclient.v1.servers:ServersController
monikerclient.cli = designateclient.cli =
domain-list = monikerclient.cli.domains:ListDomainsCommand domain-list = designateclient.cli.domains:ListDomainsCommand
domain-get = monikerclient.cli.domains:GetDomainCommand domain-get = designateclient.cli.domains:GetDomainCommand
domain-create = monikerclient.cli.domains:CreateDomainCommand domain-create = designateclient.cli.domains:CreateDomainCommand
domain-update = monikerclient.cli.domains:UpdateDomainCommand domain-update = designateclient.cli.domains:UpdateDomainCommand
domain-delete = monikerclient.cli.domains:DeleteDomainCommand domain-delete = designateclient.cli.domains:DeleteDomainCommand
domain-servers-list = monikerclient.cli.domains:ListDomainServersCommand domain-servers-list = designateclient.cli.domains:ListDomainServersCommand
record-list = monikerclient.cli.records:ListRecordsCommand record-list = designateclient.cli.records:ListRecordsCommand
record-get = monikerclient.cli.records:GetRecordCommand record-get = designateclient.cli.records:GetRecordCommand
record-create = monikerclient.cli.records:CreateRecordCommand record-create = designateclient.cli.records:CreateRecordCommand
record-update = monikerclient.cli.records:UpdateRecordCommand record-update = designateclient.cli.records:UpdateRecordCommand
record-delete = monikerclient.cli.records:DeleteRecordCommand record-delete = designateclient.cli.records:DeleteRecordCommand
server-list = monikerclient.cli.servers:ListServersCommand server-list = designateclient.cli.servers:ListServersCommand
server-get = monikerclient.cli.servers:GetServerCommand server-get = designateclient.cli.servers:GetServerCommand
server-create = monikerclient.cli.servers:CreateServerCommand server-create = designateclient.cli.servers:CreateServerCommand
server-update = monikerclient.cli.servers:UpdateServerCommand server-update = designateclient.cli.servers:UpdateServerCommand
server-delete = monikerclient.cli.servers:DeleteServerCommand server-delete = designateclient.cli.servers:DeleteServerCommand
diagnostics-ping = monikerclient.cli.diagnostics:PingCommand diagnostics-ping = designateclient.cli.diagnostics:PingCommand
diagnostics-sync-all = monikerclient.cli.diagnostics:SyncAllCommand diagnostics-sync-all = designateclient.cli.diagnostics:SyncAllCommand
diagnostics-sync-domain = monikerclient.cli.diagnostics:SyncDomainCommand diagnostics-sync-domain = designateclient.cli.diagnostics:SyncDomainCommand
diagnostics-sync-record = monikerclient.cli.diagnostics:SyncRecordCommand diagnostics-sync-record = designateclient.cli.diagnostics:SyncRecordCommand
report-count-all = monikerclient.cli.reports:CountsCommand report-count-all = designateclient.cli.reports:CountsCommand
report-count-domains = monikerclient.cli.reports:DomainCountCommand report-count-domains = designateclient.cli.reports:DomainCountCommand
report-count-records = monikerclient.cli.reports:RecordCountCommand report-count-records = designateclient.cli.reports:RecordCountCommand
report-count-tenants = monikerclient.cli.reports:TenantCountCommand report-count-tenants = designateclient.cli.reports:TenantCountCommand
report-tenants-all = monikerclient.cli.reports:TenantsCommand report-tenants-all = designateclient.cli.reports:TenantsCommand
report-tenant-domains = monikerclient.cli.reports:TenantCommand report-tenant-domains = designateclient.cli.reports:TenantCommand
[build_sphinx] [build_sphinx]
all_files = 1 all_files = 1
@ -80,15 +80,15 @@ tag_date = 0
tag_svn_revision = 0 tag_svn_revision = 0
[compile_catalog] [compile_catalog]
directory = monikerclient/locale directory = designateclient/locale
domain = monikerclient domain = designateclient
[update_catalog] [update_catalog]
domain = monikerclient domain = designateclient
output_dir = monikerclient/locale output_dir = designateclient/locale
input_file = monikerclient/locale/monikerclient.pot input_file = designateclient/locale/designateclient.pot
[extract_messages] [extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg mapping_file = babel.cfg
output_file = monikerclient/locale/monikerclient.pot output_file = designateclient/locale/designateclient.pot