projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DeprecationWarning fixes for pylint
[ganeti-local]
/
lib
/
rapi
/
connector.py
diff --git
a/lib/rapi/connector.py
b/lib/rapi/connector.py
index
9f3a314
..
499e2e6
100644
(file)
--- a/
lib/rapi/connector.py
+++ b/
lib/rapi/connector.py
@@
-22,7
+22,7
@@
"""
"""
-# pylint: disable-msg=C0103
+# pylint: disable=C0103
# C0103: Invalid name, since the R_* names are not conforming
# C0103: Invalid name, since the R_* names are not conforming
@@
-38,6
+38,7
@@
from ganeti.rapi import rlib2
_NAME_PATTERN = r"[\w\._-]+"
_NAME_PATTERN = r"[\w\._-]+"
+_DISK_PATTERN = r"\d+"
# the connection map is created at the end of this file
CONNECTOR = {}
# the connection map is created at the end of this file
CONNECTOR = {}
@@
-69,8
+70,8
@@
class Mapper:
- args: a dictionary with additional parameters from URL
"""
- args: a dictionary with additional parameters from URL
"""
- if '?' in uri:
- (path, query) = uri.split('?', 1)
+ if "?" in uri:
+ (path, query) = uri.split("?", 1)
args = cgi.parse_qs(query)
else:
path = uri
args = cgi.parse_qs(query)
else:
path = uri
@@
-106,7
+107,7
@@
class R_root(baserlib.R_Generic):
m = cls._ROOT_PATTERN.match(handler.__name__)
if m:
name = m.group(1)
m = cls._ROOT_PATTERN.match(handler.__name__)
if m:
name = m.group(1)
- if name != 'root':
+ if name != "root":
rootlist.append(name)
return baserlib.BuildUriList(rootlist, "/%s")
rootlist.append(name)
return baserlib.BuildUriList(rootlist, "/%s")
@@
-120,7
+121,7
@@
def _getResources(id_):
@return: a list of resources names.
"""
@return: a list of resources names.
"""
- r_pattern = re.compile('^R_%s_([a-zA-Z0-9]+)$' % id_)
+ r_pattern = re.compile("^R_%s_([a-zA-Z0-9]+)$" % id_)
rlist = []
for handler in CONNECTOR.values():
rlist = []
for handler in CONNECTOR.values():
@@
-133,7
+134,9
@@
def _getResources(id_):
class R_2(baserlib.R_Generic):
class R_2(baserlib.R_Generic):
- """ /2 resource, the root of the version 2 API.
+ """/2 resource.
+
+ This is the root of the version 2 API.
"""
@staticmethod
"""
@staticmethod
@@
-147,7
+150,8
@@
class R_2(baserlib.R_Generic):
def GetHandlers(node_name_pattern, instance_name_pattern,
def GetHandlers(node_name_pattern, instance_name_pattern,
- group_name_pattern, job_id_pattern):
+ group_name_pattern, job_id_pattern, disk_pattern,
+ query_res_pattern):
"""Returns all supported resources and their handlers.
"""
"""Returns all supported resources and their handlers.
"""
@@
-163,60
+167,73
@@
def GetHandlers(node_name_pattern, instance_name_pattern,
"/2": R_2,
"/2/nodes": rlib2.R_2_nodes,
"/2": R_2,
"/2/nodes": rlib2.R_2_nodes,
- re.compile(r'^/2/nodes/(%s)$' % node_name_pattern):
+ re.compile(r"^/2/nodes/(%s)$" % node_name_pattern):
rlib2.R_2_nodes_name,
rlib2.R_2_nodes_name,
- re.compile(r'^/2/nodes/(%s)/tags$' % node_name_pattern):
+ re.compile(r"^/2/nodes/(%s)/tags$" % node_name_pattern):
rlib2.R_2_nodes_name_tags,
rlib2.R_2_nodes_name_tags,
- re.compile(r'^/2/nodes/(%s)/role$' % node_name_pattern):
+ re.compile(r"^/2/nodes/(%s)/role$" % node_name_pattern):
rlib2.R_2_nodes_name_role,
rlib2.R_2_nodes_name_role,
- re.compile(r'^/2/nodes/(%s)/evacuate$' % node_name_pattern):
+ re.compile(r"^/2/nodes/(%s)/evacuate$" % node_name_pattern):
rlib2.R_2_nodes_name_evacuate,
rlib2.R_2_nodes_name_evacuate,
- re.compile(r'^/2/nodes/(%s)/migrate$' % node_name_pattern):
+ re.compile(r"^/2/nodes/(%s)/migrate$" % node_name_pattern):
rlib2.R_2_nodes_name_migrate,
rlib2.R_2_nodes_name_migrate,
- re.compile(r'^/2/nodes/(%s)/storage$' % node_name_pattern):
+ re.compile(r"^/2/nodes/(%s)/storage$" % node_name_pattern):
rlib2.R_2_nodes_name_storage,
rlib2.R_2_nodes_name_storage,
- re.compile(r'^/2/nodes/(%s)/storage/modify$' % node_name_pattern):
+ re.compile(r"^/2/nodes/(%s)/storage/modify$" % node_name_pattern):
rlib2.R_2_nodes_name_storage_modify,
rlib2.R_2_nodes_name_storage_modify,
- re.compile(r'^/2/nodes/(%s)/storage/repair$' % node_name_pattern):
+ re.compile(r"^/2/nodes/(%s)/storage/repair$" % node_name_pattern):
rlib2.R_2_nodes_name_storage_repair,
"/2/instances": rlib2.R_2_instances,
rlib2.R_2_nodes_name_storage_repair,
"/2/instances": rlib2.R_2_instances,
- re.compile(r'^/2/instances/(%s)$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)$" % instance_name_pattern):
rlib2.R_2_instances_name,
rlib2.R_2_instances_name,
- re.compile(r'^/2/instances/(%s)/info$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/info$" % instance_name_pattern):
rlib2.R_2_instances_name_info,
rlib2.R_2_instances_name_info,
- re.compile(r'^/2/instances/(%s)/tags$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/tags$" % instance_name_pattern):
rlib2.R_2_instances_name_tags,
rlib2.R_2_instances_name_tags,
- re.compile(r'^/2/instances/(%s)/reboot$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/reboot$" % instance_name_pattern):
rlib2.R_2_instances_name_reboot,
rlib2.R_2_instances_name_reboot,
- re.compile(r'^/2/instances/(%s)/reinstall$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/reinstall$" % instance_name_pattern):
rlib2.R_2_instances_name_reinstall,
rlib2.R_2_instances_name_reinstall,
- re.compile(r'^/2/instances/(%s)/replace-disks$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/replace-disks$" % instance_name_pattern):
rlib2.R_2_instances_name_replace_disks,
rlib2.R_2_instances_name_replace_disks,
- re.compile(r'^/2/instances/(%s)/shutdown$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/shutdown$" % instance_name_pattern):
rlib2.R_2_instances_name_shutdown,
rlib2.R_2_instances_name_shutdown,
- re.compile(r'^/2/instances/(%s)/startup$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/startup$" % instance_name_pattern):
rlib2.R_2_instances_name_startup,
rlib2.R_2_instances_name_startup,
- re.compile(r'^/2/instances/(%s)/activate-disks$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/activate-disks$" % instance_name_pattern):
rlib2.R_2_instances_name_activate_disks,
rlib2.R_2_instances_name_activate_disks,
- re.compile(r'^/2/instances/(%s)/deactivate-disks$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/deactivate-disks$" % instance_name_pattern):
rlib2.R_2_instances_name_deactivate_disks,
rlib2.R_2_instances_name_deactivate_disks,
- re.compile(r'^/2/instances/(%s)/prepare-export$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/prepare-export$" % instance_name_pattern):
rlib2.R_2_instances_name_prepare_export,
rlib2.R_2_instances_name_prepare_export,
- re.compile(r'^/2/instances/(%s)/export$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/export$" % instance_name_pattern):
rlib2.R_2_instances_name_export,
rlib2.R_2_instances_name_export,
- re.compile(r'^/2/instances/(%s)/migrate$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/migrate$" % instance_name_pattern):
rlib2.R_2_instances_name_migrate,
rlib2.R_2_instances_name_migrate,
- re.compile(r'^/2/instances/(%s)/rename$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/failover$" % instance_name_pattern):
+ rlib2.R_2_instances_name_failover,
+ re.compile(r"^/2/instances/(%s)/rename$" % instance_name_pattern):
rlib2.R_2_instances_name_rename,
rlib2.R_2_instances_name_rename,
- re.compile(r'^/2/instances/(%s)/modify$' % instance_name_pattern):
+ re.compile(r"^/2/instances/(%s)/modify$" % instance_name_pattern):
rlib2.R_2_instances_name_modify,
rlib2.R_2_instances_name_modify,
+ re.compile(r"^/2/instances/(%s)/disk/(%s)/grow$" %
+ (instance_name_pattern, disk_pattern)):
+ rlib2.R_2_instances_name_disk_grow,
+ re.compile(r"^/2/instances/(%s)/console$" % instance_name_pattern):
+ rlib2.R_2_instances_name_console,
"/2/groups": rlib2.R_2_groups,
"/2/groups": rlib2.R_2_groups,
- re.compile(r'^/2/groups/(%s)$' % group_name_pattern):
+ re.compile(r"^/2/groups/(%s)$" % group_name_pattern):
rlib2.R_2_groups_name,
rlib2.R_2_groups_name,
- re.compile(r'^/2/groups/(%s)/rename$' % group_name_pattern):
+ re.compile(r"^/2/groups/(%s)/modify$" % group_name_pattern):
+ rlib2.R_2_groups_name_modify,
+ re.compile(r"^/2/groups/(%s)/rename$" % group_name_pattern):
rlib2.R_2_groups_name_rename,
rlib2.R_2_groups_name_rename,
+ re.compile(r"^/2/groups/(%s)/assign-nodes$" % group_name_pattern):
+ rlib2.R_2_groups_name_assign_nodes,
+ re.compile(r"^/2/groups/(%s)/tags$" % group_name_pattern):
+ rlib2.R_2_groups_name_tags,
"/2/jobs": rlib2.R_2_jobs,
re.compile(r"^/2/jobs/(%s)$" % job_id_pattern):
"/2/jobs": rlib2.R_2_jobs,
re.compile(r"^/2/jobs/(%s)$" % job_id_pattern):
@@
-229,8
+246,13
@@
def GetHandlers(node_name_pattern, instance_name_pattern,
"/2/os": rlib2.R_2_os,
"/2/redistribute-config": rlib2.R_2_redist_config,
"/2/features": rlib2.R_2_features,
"/2/os": rlib2.R_2_os,
"/2/redistribute-config": rlib2.R_2_redist_config,
"/2/features": rlib2.R_2_features,
+ "/2/modify": rlib2.R_2_cluster_modify,
+ re.compile(r"^/2/query/(%s)$" % query_res_pattern): rlib2.R_2_query,
+ re.compile(r"^/2/query/(%s)/fields$" % query_res_pattern):
+ rlib2.R_2_query_fields,
}
CONNECTOR.update(GetHandlers(_NAME_PATTERN, _NAME_PATTERN, _NAME_PATTERN,
}
CONNECTOR.update(GetHandlers(_NAME_PATTERN, _NAME_PATTERN, _NAME_PATTERN,
- constants.JOB_ID_TEMPLATE))
+ constants.JOB_ID_TEMPLATE, _DISK_PATTERN,
+ _NAME_PATTERN))