Revision 4e5a68f8 lib/rapi/connector.py
| b/lib/rapi/connector.py | ||
|---|---|---|
| 29 | 29 |
from ganeti import http |
| 30 | 30 |
|
| 31 | 31 |
from ganeti.rapi import baserlib |
| 32 |
from ganeti.rapi import rlib1 |
|
| 33 | 32 |
from ganeti.rapi import rlib2 |
| 34 | 33 |
|
| 35 | 34 |
# the connection map is created at the end of this file |
| ... | ... | |
| 152 | 151 |
CONNECTOR.update({
|
| 153 | 152 |
"/": R_root, |
| 154 | 153 |
|
| 155 |
"/version": rlib1.R_version,
|
|
| 154 |
"/version": rlib2.R_version,
|
|
| 156 | 155 |
|
| 157 | 156 |
"/2": R_2, |
| 158 | 157 |
"/2/jobs": rlib2.R_2_jobs, |
| 159 | 158 |
"/2/nodes": rlib2.R_2_nodes, |
| 159 |
re.compile(r'^/2/nodes/([\w\._-]+)$'): rlib2.R_2_nodes_name, |
|
| 160 | 160 |
"/2/instances": rlib2.R_2_instances, |
| 161 |
re.compile(r'^/2/instances/([\w\._-]+)$'): rlib1.R_instances_name,
|
|
| 161 |
re.compile(r'^/2/instances/([\w\._-]+)$'): rlib2.R_2_instances_name,
|
|
| 162 | 162 |
re.compile(r'^/2/instances/([\w\._-]+)/tags$'): rlib2.R_2_instances_name_tags, |
| 163 | 163 |
re.compile(r'^/2/instances/([\w\._-]+)/reboot$'): |
| 164 | 164 |
rlib2.R_2_instances_name_reboot, |
| ... | ... | |
| 167 | 167 |
re.compile(r'^/2/instances/([\w\._-]+)/startup$'): |
| 168 | 168 |
rlib2.R_2_instances_name_startup, |
| 169 | 169 |
re.compile(r'/2/jobs/(%s)$' % constants.JOB_ID_TEMPLATE): rlib2.R_2_jobs_id, |
| 170 |
"/2/tags": rlib2.R_2_tags, |
|
| 171 |
"/2/info": rlib2.R_2_info, |
|
| 172 |
"/2/os": rlib2.R_2_os, |
|
| 170 | 173 |
}) |
Also available in: Unified diff