k3nny/TISbackup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove duplicate coe

Browse Source
This commit is contained in:
ssamson-tis 2016-04-14 14:32:04 +02:00
parent f624d28f28
commit 0e3892b755
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libtisbackup/backup_xcp_metadata.py
View File

@ -27,9 +27,7 @@ class backup_xcp_metadata(backup_generic):
"""Backup metatdata of a xcp pool using xe pool-dump-database""" """Backup metatdata of a xcp pool using xe pool-dump-database"""
type = 'xcp-dump-metadata' type = 'xcp-dump-metadata'
required_params = ['type','server_name','private_key','backup_name'] required_params = ['type','server_name','private_key','backup_name']
optional_params = backup_generic.optional_params + ['ssh_port']
ssh_port = 22
def do_backup(self,stats): def do_backup(self,stats):
self.logger.debug('[%s] Connecting to %s with user root and key %s',self.backup_name,self.server_name,self.private_key) self.logger.debug('[%s] Connecting to %s with user root and key %s',self.backup_name,self.server_name,self.private_key)
@ -40,22 +38,11 @@ class backup_xcp_metadata(backup_generic):
# dump pool medatadata # dump pool medatadata
localpath = os.path.join(self.backup_dir , 'xcp_metadata-' + backup_start_date + '.dump') localpath = os.path.join(self.backup_dir , 'xcp_metadata-' + backup_start_date + '.dump')
try:
mykey = paramiko.RSAKey.from_private_key_file(self.private_key)
except paramiko.SSHException:
mykey = paramiko.DSSKey.from_private_key_file(self.private_key)
self.ssh = paramiko.SSHClient()
self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
self.ssh.connect(self.server_name,username='root',pkey = mykey, port=self.ssh_port)
stats['status']='Dumping' stats['status']='Dumping'
if not self.dry_run: if not self.dry_run:
cmd = "/opt/xensource/bin/xe pool-dump-database file-name=" cmd = "/opt/xensource/bin/xe pool-dump-database file-name="
self.logger.debug('[%s] Dump XCP Metadata : %s', self.backup_name, cmd) self.logger.debug('[%s] Dump XCP Metadata : %s', self.backup_name, cmd)
(error_code, output) = ssh_exec(cmd, ssh=self.ssh) (error_code, output) = ssh_exec(cmd, server_name=self.server_name,private_key=self.private_key, remote_user='root')
with open(localpath,"w") as f: with open(localpath,"w") as f:
f.write(output) f.write(output)

2
libtisbackup/common.py
View File

@ -480,7 +480,7 @@ def ssh_exec(command,ssh=None,server_name='',remote_user='',private_key='',ssh_p
ssh = paramiko.SSHClient() ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
ssh.connect(server_name,username=remote_user,pkey = private_key,port=ssh_port) ssh.connect(server_name,username=remote_user,pkey = mykey,port=ssh_port)
tran = ssh.get_transport() tran = ssh.get_transport()
chan = tran.open_session() chan = tran.open_session()