EOF & whitespace
This commit is contained in:
+34
-35
@@ -59,15 +59,15 @@ class backup_vmdk(backup_generic):
|
||||
cookie_text = " " + cookie_value + "; $" + cookie_path
|
||||
# Make a cookie
|
||||
cookie = dict()
|
||||
cookie[cookie_name] = cookie_text
|
||||
cookie[cookie_name] = cookie_text
|
||||
return cookie
|
||||
|
||||
|
||||
def download_file(self,url, local_filename, cookie, headers):
|
||||
r = requests.get(url, stream=True, headers=headers,cookies=cookie,verify=False)
|
||||
with open(local_filename, 'wb') as f:
|
||||
for chunk in r.iter_content(chunk_size=1024*1024*64):
|
||||
if chunk:
|
||||
for chunk in r.iter_content(chunk_size=1024*1024*64):
|
||||
if chunk:
|
||||
f.write(chunk)
|
||||
f.flush()
|
||||
return local_filename
|
||||
@@ -78,7 +78,7 @@ class backup_vmdk(backup_generic):
|
||||
try:
|
||||
infos = HttpNfcLease.info
|
||||
device_urls = infos.deviceUrl
|
||||
vmdks = []
|
||||
vmdks = []
|
||||
for device_url in device_urls:
|
||||
deviceId = device_url.key
|
||||
deviceUrlStr = device_url.url
|
||||
@@ -89,7 +89,7 @@ class backup_vmdk(backup_generic):
|
||||
cookie = self.make_compatible_cookie(si._stub.cookie)
|
||||
headers = {'Content-Type': 'application/octet-stream'}
|
||||
self.logger.debug("[%s] exporting disk: %s" %(self.server_name,diskFileName))
|
||||
|
||||
|
||||
self.download_file(diskUrlStr, diskFileName, cookie, headers)
|
||||
vmdks.append({"filename":diskFileName,"id":deviceId})
|
||||
finally:
|
||||
@@ -99,8 +99,8 @@ class backup_vmdk(backup_generic):
|
||||
|
||||
def create_ovf(self,vm,vmdks):
|
||||
ovfDescParams = vim.OvfManager.CreateDescriptorParams()
|
||||
ovf = si.content.ovfManager.CreateDescriptor(vm, ovfDescParams)
|
||||
root = ET.fromstring(ovf.ovfDescriptor)
|
||||
ovf = si.content.ovfManager.CreateDescriptor(vm, ovfDescParams)
|
||||
root = ET.fromstring(ovf.ovfDescriptor)
|
||||
new_id = list(root[0][1].attrib.values())[0][1:3]
|
||||
ovfFiles = []
|
||||
for vmdk in vmdks:
|
||||
@@ -109,14 +109,14 @@ class backup_vmdk(backup_generic):
|
||||
ovfFiles.append(vim.OvfManager.OvfFile(size=os.path.getsize(vmdk['filename']), path=vmdk['filename'], deviceId=id))
|
||||
|
||||
ovfDescParams = vim.OvfManager.CreateDescriptorParams()
|
||||
ovfDescParams.ovfFiles = ovfFiles;
|
||||
ovfDescParams.ovfFiles = ovfFiles;
|
||||
|
||||
ovf = si.content.ovfManager.CreateDescriptor(vm, ovfDescParams)
|
||||
ovf = si.content.ovfManager.CreateDescriptor(vm, ovfDescParams)
|
||||
ovf_filename = vm.name+".ovf"
|
||||
self.logger.debug("[%s] creating ovf file: %s" %(self.server_name,ovf_filename))
|
||||
|
||||
with open(ovf_filename, "w") as f:
|
||||
f.write(ovf.ovfDescriptor)
|
||||
|
||||
with open(ovf_filename, "w") as f:
|
||||
f.write(ovf.ovfDescriptor)
|
||||
return ovf_filename
|
||||
|
||||
def create_ova(self,vm, vmdks, ovf_filename):
|
||||
@@ -131,9 +131,9 @@ class backup_vmdk(backup_generic):
|
||||
|
||||
def clone_vm(self,vm):
|
||||
task = self.wait_task(vm.CreateSnapshot_Task(name="backup",description="Automatic backup "+datetime.now().strftime("%Y-%m-%d %H:%M:%s"),memory=False,quiesce=True))
|
||||
snapshot=task.info.result
|
||||
snapshot=task.info.result
|
||||
prefix_vmclone = self.prefix_clone
|
||||
clone_name = prefix_vmclone + vm.name
|
||||
clone_name = prefix_vmclone + vm.name
|
||||
datastore = '[%s]' % vm.datastore[0].name
|
||||
|
||||
|
||||
@@ -146,16 +146,16 @@ class backup_vmdk(backup_generic):
|
||||
config = vim.vm.ConfigSpec(name=clone_name, memoryMB=vm.summary.config.memorySizeMB, numCPUs=vm.summary.config.numCpu, files=vmx_file)
|
||||
|
||||
hosts = datacenter.hostFolder.childEntity
|
||||
resource_pool = hosts[0].resourcePool
|
||||
resource_pool = hosts[0].resourcePool
|
||||
|
||||
self.wait_task(vmFolder.CreateVM_Task(config=config,pool=resource_pool))
|
||||
self.wait_task(vmFolder.CreateVM_Task(config=config,pool=resource_pool))
|
||||
|
||||
new_vm = [x for x in vmFolder.childEntity if x.name == clone_name][0]
|
||||
|
||||
controller = vim.vm.device.VirtualDeviceSpec()
|
||||
controller.operation = vim.vm.device.VirtualDeviceSpec.Operation.add
|
||||
controller.device = vim.vm.device.VirtualLsiLogicController(busNumber=0,sharedBus='noSharing')
|
||||
controller.device.key = 0
|
||||
controller.device = vim.vm.device.VirtualLsiLogicController(busNumber=0,sharedBus='noSharing')
|
||||
controller.device.key = 0
|
||||
i=0
|
||||
|
||||
vm_devices = []
|
||||
@@ -189,7 +189,7 @@ class backup_vmdk(backup_generic):
|
||||
|
||||
|
||||
|
||||
vm_devices.append(controller)
|
||||
vm_devices.append(controller)
|
||||
|
||||
config.deviceChange=vm_devices
|
||||
self.wait_task(new_vm.ReconfigVM_Task(config))
|
||||
@@ -198,7 +198,7 @@ class backup_vmdk(backup_generic):
|
||||
def wait_task(self,task):
|
||||
while task.info.state in ["queued", "running"]:
|
||||
time.sleep(2)
|
||||
self.logger.debug("[%s] %s",self.server_name,task.info.descriptionId)
|
||||
self.logger.debug("[%s] %s",self.server_name,task.info.descriptionId)
|
||||
return task
|
||||
|
||||
|
||||
@@ -213,7 +213,7 @@ class backup_vmdk(backup_generic):
|
||||
else:
|
||||
print('mkdir "%s"' % dest_dir)
|
||||
else:
|
||||
raise Exception('backup destination directory already exists : %s' % dest_dir)
|
||||
raise Exception('backup destination directory already exists : %s' % dest_dir)
|
||||
os.chdir(dest_dir)
|
||||
user_esx, password_esx, null = open(self.password_file).read().split('\n')
|
||||
|
||||
@@ -237,27 +237,27 @@ class backup_vmdk(backup_generic):
|
||||
if vm.name == self.server_name:
|
||||
vm_is_off = vm.summary.runtime.powerState == "poweredOff"
|
||||
if str2bool(self.halt_vm):
|
||||
vm.ShutdownGuest()
|
||||
vm.ShutdownGuest()
|
||||
vm_is_off = True
|
||||
|
||||
|
||||
if vm_is_off:
|
||||
vmdks = self.export_vmdks(vm)
|
||||
ovf_filename = self.create_ovf(vm, vmdks)
|
||||
ovf_filename = self.create_ovf(vm, vmdks)
|
||||
else:
|
||||
new_vm = self.clone_vm(vm)
|
||||
vmdks = self.export_vmdks(new_vm)
|
||||
ovf_filename = self.create_ovf(vm, vmdks)
|
||||
self.wait_task(new_vm.Destroy_Task())
|
||||
|
||||
self.wait_task(new_vm.Destroy_Task())
|
||||
|
||||
if str2bool(self.create_ovafile):
|
||||
ova_filename = self.create_ova(vm, vmdks, ovf_filename)
|
||||
|
||||
ova_filename = self.create_ova(vm, vmdks, ovf_filename)
|
||||
|
||||
if str2bool(self.halt_vm):
|
||||
vm.PowerOnVM()
|
||||
|
||||
vm.PowerOnVM()
|
||||
|
||||
|
||||
if os.path.exists(dest_dir):
|
||||
for file in os.listdir(dest_dir):
|
||||
for file in os.listdir(dest_dir):
|
||||
stats['written_bytes'] += os.stat(file)[ST_SIZE]
|
||||
stats['total_files_count'] += 1
|
||||
stats['written_files_count'] += 1
|
||||
@@ -266,10 +266,10 @@ class backup_vmdk(backup_generic):
|
||||
stats['written_bytes'] = 0
|
||||
|
||||
stats['backup_location'] = dest_dir
|
||||
|
||||
|
||||
stats['log']='XVA backup from %s OK, %d bytes written' % (self.server_name,stats['written_bytes'])
|
||||
stats['status']='OK'
|
||||
|
||||
stats['status']='OK'
|
||||
|
||||
|
||||
except BaseException as e:
|
||||
stats['status']='ERROR'
|
||||
@@ -279,4 +279,3 @@ class backup_vmdk(backup_generic):
|
||||
|
||||
|
||||
register_driver(backup_vmdk)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user