Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2588ee4
draas initial changes
abh1sar Sep 2, 2025
8f0ce46
Fix UT failure in UserVmManagerImplTest
abh1sar Sep 2, 2025
4eac151
Added option to enable disaster recovery on a backup respository. Add…
abh1sar Sep 3, 2025
090c222
Added timeout for mount operation in backup restore configurable via …
abh1sar Sep 4, 2025
b6b8a0f
Merge remote-tracking branch 'upstream/main' into draas
abh1sar Sep 4, 2025
6c03978
Addressed review comments
abh1sar Sep 8, 2025
a58f6d4
fix for simulator test failures
abh1sar Sep 9, 2025
dae4f3b
Added UT for coverage
abh1sar Sep 9, 2025
7449646
Fix create instance from backup ui for other providers
abh1sar Sep 9, 2025
0df7f8d
Added events to add/update backup repository
abh1sar Sep 9, 2025
9dd75f2
Fix race in fetchZones
abh1sar Sep 15, 2025
5941150
One more fix in fetchZones in DeployVMFromBackup.vue
abh1sar Sep 15, 2025
0910dfe
Fix zone selection in createNetwork via Create Instance from backup f…
abh1sar Sep 15, 2025
1aa08b0
Allow template/iso selection in create instance from backup ui
abh1sar Sep 15, 2025
bc7055d
rename draasenabled to crosszoneinstancecreation
abh1sar Sep 15, 2025
6f39390
Added Cross-zone instance creation in test_backup_recovery_nas.py
abh1sar Sep 16, 2025
def5f8f
Added UT in BackupManagerTest and UserVmManagerImplTest
abh1sar Sep 16, 2025
faebe18
Integration test added for Cross-zone instance creation in test_backu…
abh1sar Sep 16, 2025
bdbfe54
Merge remote-tracking branch 'origin/draas' into draas
abh1sar Sep 16, 2025
ea8d8d6
Merge branch 'main' into draas
abh1sar Sep 22, 2025
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
Prev Previous commit
Next Next commit
Allow template/iso selection in create instance from backup ui
  • Loading branch information
abh1sar committed Sep 15, 2025
commit 1aa08b0979b5826b578e349fd1b259527630c806
10 changes: 7 additions & 3 deletions ui/src/views/compute/wizard/TemplateIsoRadioGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,14 @@ export default {
},
methods: {
onSelectTemplateIso () {
if (this.inputDecorator === 'templateid') {
this.value = !this.preFillContent.templateid ? this.selected : this.preFillContent.templateid
if (this.preFillContent?.allowtemplateisoselection) {
this.value = this.selected
} else {
this.value = !this.preFillContent.isoid ? this.selected : this.preFillContent.isoid
if (this.inputDecorator === 'templateid') {
this.value = !this.preFillContent.templateid ? this.selected : this.preFillContent.templateid
} else {
this.value = !this.preFillContent.isoid ? this.selected : this.preFillContent.isoid
}
}

this.$emit('emit-update-template-iso', this.inputDecorator, this.value)
Expand Down
1 change: 1 addition & 0 deletions ui/src/views/storage/CreateVMFromBackup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ export default {
this.dataPreFill.backupid = this.resource.id
this.dataPreFill.computeofferingid = this.vmdetails.serviceofferingid
this.dataPreFill.templateid = this.vmdetails.templateid
this.dataPreFill.allowtemplateisoselection = true
this.dataPreFill.isoid = this.vmdetails.templateid
this.dataPreFill.allowIpAddressesFetch = !this.resource.virtualmachineid
if (this.vmdetails.nics) {
Expand Down
Loading