diff --git a/fuel_dev_tools/cmd_parser.py b/fuel_dev_tools/cmd_parser.py index 65b7ab1..4f391fe 100644 --- a/fuel_dev_tools/cmd_parser.py +++ b/fuel_dev_tools/cmd_parser.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. + class CmdParserMixin(object): """Mixin for parsing fuel CLI output.""" @@ -33,4 +34,4 @@ class CmdParserMixin(object): values = [v.strip() for v in line.split('|')] ret.append(dict(zip(header, values))) - return ret \ No newline at end of file + return ret diff --git a/fuel_dev_tools/docker/__init__.py b/fuel_dev_tools/docker/__init__.py index fd72fc6..348f152 100644 --- a/fuel_dev_tools/docker/__init__.py +++ b/fuel_dev_tools/docker/__init__.py @@ -37,13 +37,13 @@ class DockerMixin(ssh.SSHMixin): def container_command(self, *commands): return [ - #'lxc-attach', '--name', self.get_full_docker_id() + # 'lxc-attach', '--name', self.get_full_docker_id() 'docker', 'exec', self.get_docker_id() ] + list(commands) def container_command_interactive(self, *commands): return [ - #'lxc-attach', '--name', self.get_full_docker_id() + # 'lxc-attach', '--name', self.get_full_docker_id() 'docker', 'exec', '-it', self.get_docker_id() ] + list(commands) diff --git a/fuel_dev_tools/docker/astute.py b/fuel_dev_tools/docker/astute.py index a91ee78..07848d3 100644 --- a/fuel_dev_tools/docker/astute.py +++ b/fuel_dev_tools/docker/astute.py @@ -32,7 +32,8 @@ class AstuteInfo(DockerAstuteMixin, info.BasicInfo): def get_info(cls): return """Admin token is stored in /etc/fuel/astute.yaml on Fuel Main. -If you want to send custom receiverd response from Astute: http://sprunge.us/UJfb +If you want to send custom receiverd response from Astute: +http://sprunge.us/UJfb """ diff --git a/fuel_dev_tools/docker/nailgun.py b/fuel_dev_tools/docker/nailgun.py index 1873374..b0ede5c 100644 --- a/fuel_dev_tools/docker/nailgun.py +++ b/fuel_dev_tools/docker/nailgun.py @@ -49,7 +49,8 @@ class DBReset(DockerNailgunMixin, from fuel_dev_tools.docker import postgres reset_sql = """ -SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'nailgun'; +SELECT pg_terminate_backend(pid) FROM pg_stat_activity +WHERE pid <> pg_backend_pid() AND datname = 'nailgun'; DROP DATABASE nailgun; CREATE DATABASE nailgun WITH OWNER nailgun; """ diff --git a/fuel_dev_tools/docker/rabbitmq.py b/fuel_dev_tools/docker/rabbitmq.py index 6798654..4dd5665 100644 --- a/fuel_dev_tools/docker/rabbitmq.py +++ b/fuel_dev_tools/docker/rabbitmq.py @@ -12,9 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six -import subprocess - from fuel_dev_tools import docker from fuel_dev_tools import info diff --git a/fuel_dev_tools/puppet.py b/fuel_dev_tools/puppet.py index 68f3114..707676f 100644 --- a/fuel_dev_tools/puppet.py +++ b/fuel_dev_tools/puppet.py @@ -14,9 +14,9 @@ import os -from fuel_dev_tools import info from fuel_dev_tools import command from fuel_dev_tools import docker +from fuel_dev_tools import info from fuel_dev_tools import rsync from fuel_dev_tools import ssh diff --git a/fuel_dev_tools/rsync.py b/fuel_dev_tools/rsync.py index 1b96951..7fc560f 100644 --- a/fuel_dev_tools/rsync.py +++ b/fuel_dev_tools/rsync.py @@ -29,7 +29,8 @@ class RsyncMixin(object): return parser def build_app_args_target(self, target): - target = '{}@{}:{}'.format(self.app_args.user, self.app_args.ip, target) + target = '{}@{}:{}'.format(self.app_args.user, + self.app_args.ip, target) args = ['-e', 'ssh -p {}'.format(self.app_args.port)] return target, args @@ -37,10 +38,10 @@ class RsyncMixin(object): def rsync(self, source, target, *args): self.print_debug('RSYNC: %s --> %s' % (source, target)) - #result = project.rsync_project( + # result = project.rsync_project( # local_dir=source, # remote_dir=target - #) + # ) result = subprocess.check_output( ['rsync', '-avz'] + list(args) + [source, target] diff --git a/fuel_dev_tools/shell.py b/fuel_dev_tools/shell.py old mode 100644 new mode 100755 index b6fa4f4..0bbe229 --- a/fuel_dev_tools/shell.py +++ b/fuel_dev_tools/shell.py @@ -33,11 +33,11 @@ from fuel_dev_tools.docker import nailgun from fuel_dev_tools.docker import nginx from fuel_dev_tools.docker import postgres from fuel_dev_tools.docker import rabbitmq -from fuel_dev_tools.slaves import mcagent from fuel_dev_tools import exc from fuel_dev_tools import info from fuel_dev_tools import puppet from fuel_dev_tools import pythonclient +from fuel_dev_tools.slaves import mcagent from fuel_dev_tools import ssh diff --git a/fuel_dev_tools/ssh.py b/fuel_dev_tools/ssh.py index b0e1c73..e0d7cde 100644 --- a/fuel_dev_tools/ssh.py +++ b/fuel_dev_tools/ssh.py @@ -33,7 +33,8 @@ class SSHMixin(object): super(SSHMixin, self).__init__(*args, **kwargs) if self.app_args: - fabric_api.env.host_string = '{0}:{1}'.format(self.app_args.ip, self.app_args.port) + fabric_api.env.host_string = '{0}:{1}'.format(self.app_args.ip, + self.app_args.port) fabric_api.env.user = self.app_args.user if not self.app_args.debug: @@ -41,8 +42,8 @@ class SSHMixin(object): fabric.state.output[key] = False def send_identity(self): - self.print_debug('Sending identity %s for passwordless authentication' % - self.app_args.identity_file) + self.print_debug('Sending identity %s for passwordless ' + 'authentication' % self.app_args.identity_file) with open('%s.pub' % self.app_args.identity_file) as f: contents = f.read() @@ -103,14 +104,14 @@ class SSHMixin(object): # NOTE: fabric's open_shell is broken: it's TERM or something like # that that breaks arrow keys for browsing history in Bash, etc. - #command = None - - #if args: - #command = ' '.join(args) - - #self.print_debug('interactive %s' % command) - - #fabric_api.open_shell(command=command) + # command = None + # + # if args: + # command = ' '.join(args) + # + # self.print_debug('interactive %s' % command) + # + # fabric_api.open_shell(command=command) commands = [ 'ssh', '-t',