Revision a744b676 lib/masterd/instance.py
b/lib/masterd/instance.py | ||
---|---|---|
32 | 32 |
from ganeti import compat |
33 | 33 |
from ganeti import utils |
34 | 34 |
from ganeti import objects |
35 |
from ganeti import netutils |
|
35 | 36 |
|
36 | 37 |
|
37 | 38 |
class _ImportExportError(Exception): |
... | ... | |
1553 | 1554 |
if not utils.VerifySha1Hmac(cds, msg, hmac_digest, salt=hmac_salt): |
1554 | 1555 |
raise errors.GenericError("HMAC is wrong") |
1555 | 1556 |
|
1556 |
return (utils.HostInfo.NormalizeName(host), |
|
1557 |
return (netutils.HostInfo.NormalizeName(host),
|
|
1557 | 1558 |
utils.ValidateServiceName(port), |
1558 | 1559 |
magic) |
1559 | 1560 |
|
Also available in: Unified diff