Revision 10b207d4 lib/rapi/RESTHTTPServer.py
b/lib/rapi/RESTHTTPServer.py | ||
---|---|---|
20 | 20 |
|
21 | 21 |
""" |
22 | 22 |
|
23 |
import socket |
|
24 | 23 |
import BaseHTTPServer |
25 | 24 |
import OpenSSL |
25 |
import re |
|
26 |
import socket |
|
26 | 27 |
import time |
27 | 28 |
|
28 | 29 |
from ganeti import constants |
... | ... | |
30 | 31 |
from ganeti import logger |
31 | 32 |
from ganeti import rpc |
32 | 33 |
from ganeti import serializer |
33 |
from ganeti.rapi import resources |
|
34 |
|
|
35 |
from ganeti.rapi import connector |
|
34 | 36 |
from ganeti.rapi import httperror |
35 | 37 |
|
36 | 38 |
|
... | ... | |
158 | 160 |
self.connection = self.request |
159 | 161 |
self.rfile = socket._fileobject(self.request, "rb", self.rbufsize) |
160 | 162 |
self.wfile = socket._fileobject(self.request, "wb", self.wbufsize) |
161 |
self._resmap = resources.Mapper()
|
|
163 |
self._resmap = connector.Mapper()
|
|
162 | 164 |
|
163 | 165 |
def handle_one_request(self): |
164 | 166 |
"""Handle a single REST request. |
Also available in: Unified diff