stackforge/rubick
Code Issues Proposed changes

Implemented custom SSH port support

Browse Source
This commit is contained in:
Maxim Kulkin 2013-10-08 17:24:15 +04:00
parent 10486c4846
commit ae2b2c93be
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
discover_test.py
View File

@ -1,10 +1,9 @@
import logging
from itertools import groupby
from ostack_validator.common import Issue, MarkedIssue
from ostack_validator.common import Issue, MarkedIssue, Inspection
from ostack_validator.model import OpenstackComponent
from ostack_validator.discovery import OpenstackDiscovery
from ostack_validator.inspection import Inspection
from ostack_validator.inspections import KeystoneAuthtokenSettingsInspection
def print_components(openstack):

14
ostack_validator/discovery.py
View File

@ -12,9 +12,9 @@ from ostack_validator.model import Openstack, Host, OpenstackComponent, Keystone
class NodeClient(object):
def __init__(self, node_address, username, private_key_file):
def __init__(self, node_address, username, private_key_file, ssh_port=22):
super(NodeClient, self).__init__()
self.shell = spur.SshShell(hostname=node_address, username=username, private_key_file=private_key_file, missing_host_key=spur.ssh.MissingHostKey.accept)
self.shell = spur.SshShell(hostname=node_address, port=ssh_port, username=username, private_key_file=private_key_file, missing_host_key=spur.ssh.MissingHostKey.accept)
def run(self, command):
return self.shell.run(command)
@ -23,6 +23,7 @@ class NodeClient(object):
return self.shell.open(path, mode)
python_re = re.compile('(/?([^/]*/)*)python[0-9.]*')
host_port_re = re.compile('(\d+\.\d+\.\d+\.\d+):(\d+)')
class OpenstackDiscovery(object):
def discover(self, initial_nodes, username, private_key):
@ -37,7 +38,14 @@ class OpenstackDiscovery(object):
for address in initial_nodes:
try:
client = NodeClient(address, username=username, private_key_file=private_key_file.name)
m = host_port_re.match(address)
if m:
host = m.group(1)
port = int(m.group(2))
else:
host = address
port = 22
client = NodeClient(host, ssh_port=port, username=username, private_key_file=private_key_file.name)
client.run(['echo', 'test'])
except:
openstack.report_issue(Issue(Issue.WARNING, "Can't connect to node %s" % address))