Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions VMBackup/main/Utils/HostSnapshotObjects.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
import json

class HostDoSnapshotRequestBody:
def __init__(self, taskId, diskIds, settings, snapshotTaskToken, snapshotMetadata):
def __init__(self, taskId, diskIds, settings, snapshotTaskToken, snapshotMetadata, instantAccessDurationMinutes = None):
self.taskId = taskId
self.diskIds = diskIds
self.snapshotMetadata = snapshotMetadata
self.snapshotTaskToken = snapshotTaskToken
self.settings = settings
self.instantAccessDurationMinutes = instantAccessDurationMinutes

def convertToDictionary(self):
return dict(taskId = self.taskId, diskIds = self.diskIds, settings = self.settings, snapshotTaskToken = self.snapshotTaskToken, snapshotMetadata = self.snapshotMetadata)
return dict(taskId = self.taskId, diskIds = self.diskIds, settings = self.settings, snapshotTaskToken = self.snapshotTaskToken, snapshotMetadata = self.snapshotMetadata, instantAccessDurationMinutes = self.instantAccessDurationMinutes)

class HostPreSnapshotRequestBody:
def __init__(self, taskId, snapshotTaskToken):
def __init__(self, taskId, snapshotTaskToken, instantAccessDurationMinutes = None):
self.taskId = taskId
self.snapshotTaskToken = snapshotTaskToken
self.instantAccessDurationMinutes = instantAccessDurationMinutes

def convertToDictionary(self):
return dict(taskId = self.taskId, snapshotTaskToken = self.snapshotTaskToken)
return dict(taskId = self.taskId, snapshotTaskToken = self.snapshotTaskToken, instantAccessDurationMinutes = self.instantAccessDurationMinutes)

class BlobSnapshotInfo:
def __init__(self, isSuccessful, snapshotUri, errorMessage, statusCode, ddSnapshotIdentifier = None):
Expand All @@ -31,11 +33,12 @@ def convertToDictionary(self):
return dict(isSuccessful = self.isSuccessful, snapshotUri = self.snapshotUri, errorMessage = self.errorMessage, statusCode = self.statusCode, ddSnapshotIdentifier = self.ddSnapshotIdentifier)

class DDSnapshotIdentifier:
def __init__(self, creationTime, id, token):
def __init__(self, creationTime, id, token, instantAccessDurationMinutes = None):
self.creationTime = creationTime
self.id = id
self.token = token
self.instantAccessDurationMinutes = instantAccessDurationMinutes

def convertToDictionary(self):
return dict(creationTime = self.creationTime, id = self.id, token = self.token)
return dict(creationTime = self.creationTime, id = self.id, token = self.token, instantAccessDurationMinutes = self.instantAccessDurationMinutes)

5 changes: 3 additions & 2 deletions VMBackup/main/Utils/Status.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,14 @@ def convertToDictionary(self):
return dict(isSuccessful = self.isSuccessful, snapshotUri = self.snapshotUri, errorMessage = self.errorMessage, blobUri = self.blobUri, directDriveSnapshotIdentifier = self.directDriveSnapshotIdentifier)

class DirectDriveSnapshotIdentifier:
def __init__(self, creationTime, id, token):
def __init__(self, creationTime, id, token, instantAccessDurationMinutes = None):
self.creationTime = creationTime
self.id = id
self.token = token
self.instantAccessDurationMinutes = instantAccessDurationMinutes # This is populated for DD disk with Instant Access snapshot

def convertToDictionary(self):
return dict(creationTime = self.creationTime, id = self.id, token = self.token)
return dict(creationTime = self.creationTime, id = self.id, token = self.token, instantAccessDurationMinutes = self.instantAccessDurationMinutes)

class CreationTime:
def __init__(self, DateTime, OffsetMinutes):
Expand Down
1 change: 1 addition & 0 deletions VMBackup/main/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class CommonVariables:
isVmgsBlobIncluded = 'isVmgsBlobIncluded'
isAnyWADiskIncluded = 'isAnyWADiskIncluded'
isAnyDirectDriveDiskIncluded = 'isAnyDirectDriveDiskIncluded'
instantAccessDurationMinutes = 'instantAccessDurationMinutes'

onlyGuest = 'onlyGuest'
firstGuestThenHost = 'firstGuestThenHost'
Expand Down
12 changes: 11 additions & 1 deletion VMBackup/main/parameterparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def __init__(self, protected_settings, public_settings, backup_logger):
settingKeysMapping[CommonVariables.useMccfForLad.lower()] = CommonVariables.useMccfForLad
settingKeysMapping[CommonVariables.enableSnapshotExtensionPolling.lower()] = CommonVariables.enableSnapshotExtensionPolling
self.includeLunList = [] #To be shared with HP
self.instantAccessDurationMinutes = None

"""
get the public configuration
Expand Down Expand Up @@ -131,4 +132,13 @@ def __init__(self, protected_settings, public_settings, backup_logger):
errorMsg = "Exception occurred while populating settings, Exception: %s" % (str(e))
backup_logger.log(errorMsg, True)

backup_logger.log("settings to be sent " + str(self.wellKnownSettingFlags), True)
backup_logger.log("settings to be sent " + str(self.wellKnownSettingFlags), True)

try:
if(self.includedDisks != None):
if(CommonVariables.instantAccessDurationMinutes in self.includedDisks.keys() and self.includedDisks[CommonVariables.instantAccessDurationMinutes] != None):
self.instantAccessDurationMinutes = self.includedDisks[CommonVariables.instantAccessDurationMinutes]
backup_logger.log("InstantAccessDurationMinutes = " + str(self.instantAccessDurationMinutes), True)
except Exception as e:
errorMsg = "Exception occurred while extracting instantAccessDurationMinutes, Exception: %s" % (str(e))
backup_logger.log(errorMsg, True)