Skip to content

Crossport OVF deployment related fixes for VM Operator#3982

Merged
akutz merged 19 commits intovmware:vm-operator-vc-9.1.0from
aruneshpa:topic/vm-op-ovf-cherry-picks
Mar 17, 2026
Merged

Crossport OVF deployment related fixes for VM Operator#3982
akutz merged 19 commits intovmware:vm-operator-vc-9.1.0from
aruneshpa:topic/vm-op-ovf-cherry-picks

Conversation

@aruneshpa
Copy link
Copy Markdown
Contributor

@aruneshpa aruneshpa commented Mar 17, 2026

Description

This is a release branch created for VCF 9.1 release to support deployment of OVFs using VM Operator.

How Has This Been Tested?

Yes, tested internally on a testbed.

@aruneshpa aruneshpa changed the title Topic/vm op ovf cherry picks Crossport OVF deployment related fixes for VM Operator Mar 17, 2026
@aruneshpa aruneshpa force-pushed the topic/vm-op-ovf-cherry-picks branch from 71770fc to a60f7a5 Compare March 17, 2026 20:41
hpannem and others added 19 commits March 17, 2026 13:43
@hpannem @aruneshpa
fix: parsing vApp properties while converting from OVF envelope to VM…
afa1d07 
… ConfigSpec(vmware#3964)

Signed-off-by: Hemanth kumar Pannem <hemanth-kumar.pannem@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: File-backed disks in OVF->ConfigSpec
c6a037f 
Distinguish OVF disks that are backed by a file (ovf:fileRef) from
capacity-only (empty) disks in the generated ConfigSpec.

Implementation (configspec.go):
- Build a fileRefs map from Envelope.References and pass it through
  toHardware into toVirtualDisk.
- For disks with a DiskSection fileRef, set backing FileName from
  path.Base(File.Href) so file-backed disks get a non-empty name;
  empty disks keep an empty backing name.
- Build DeviceChange explicitly: for VirtualDisks, set FileOperation
  to Create for empty disks and to empty string for file-backed disks
  (existing file).

Tests and fixtures:
- Add fixtures/mixed-disks.ovf (one file-backed disk, one empty) and
  test "Mixed file-backed and empty disks" for backing FileName and
  FileOperation.
- Add test "File-backed disk name from path.Base(File.Href)" using
  fixtures/file-ref-path.ovf.
- In "Large" test, assert file-backed disk has non-empty FileName and
  empty disk has empty FileName.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Parse OVF property qualifiers per DSP0243
31a20ad 
- Add OVF-to-vApp type mapping
  (DSP0243 Table 6 → vim.vApp.PropertyInfo):
  uint8/sint8/.../sint64 → int, String → string, Boolean → boolean,
  real32/real64 → real. Honor ovf:password for string → password.
- Parse ovf:qualifiers per DSP0243 9.5.1 Table 7: MinLen, MaxLen,
  ValueMap for string; ValueMap for integer types.
- Build VAppPropertyInfo.Type from base type and qualifiers (e.g.
  MinLen(1),MaxLen(65535) → string(1..65535), ValueMap → string["a","b"]
  or int(min..max)).
- Use computed type in toVAppConfig for both the property Info.Type and
  for parseVAppConfigValue so qualifier-derived constraints are applied.
- Add tests for qualifier-derived types and expect root_pwd Type
  "password" when ovf:password="true".

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Support explicit deployment configuration
7a13bba 
Add DeploymentConfiguration to ToConfigSpecOptions to select which
deployment option (DeploymentOptionSection) to use; default or first
if empty. Resolve by name with resolveDeploymentConfiguration().

Add tests for deployment config selection, OVF property types to
vAppPropertyInfo.Type, and file-ref path in disk backing.

Add fixtures: deployment-configs.ovf, property-types.ovf,
file-ref-path.ovf.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Fix string min/max
224e9be 
This patch fixes the vAppPropertyInfo types for strings with min/max
qualifiers.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Disk capacity via prop, invalid prop keys
e8a815f 
This patch adds support for specifying OVF disk capacity via an OVF
property as well as handles possible invalid property key names.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Product categories
8009f3e 
This patch supports OVF product categories.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Uber OVF
8823e7e 
This patch adds OVF testing based on an uber OVF.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: vSphere-specific OVF qualifiers
87c11d7 
This patch adds support for vSphere-specific OVF property qualifiers.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Add OVF test fixtures
59a1b83 
This patch adds exhaustive OVF testing.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Support disks sans contrllers
0d9c7f2 
Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Default to first VirtualSystem in OVF
21b84c7 
This patch changes ovf.ToConfigSpec to use the first element in a
VirtualSystemCollection if there is no VirtualSystem present.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
Merge pull request vmware#3971 from akutz/feature/indicate-file-backe…
6098e8c 
…d-disk-from-ovf

ovf: Support non-file backed disks, deployment configs, and vApp property qualifiers
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: OVF->ConfigSpec support nil VHW
f283c37 
This patch allows the ovf.ToConfigSpec function to support when
an OVF does not have a VirtualHardware element.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: Support OVF->ConfigSpec SR-IOV NICs
a70d59e 
This patch supports ovf.ToConfigSpec with SR-IOV NICs.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
api: More OVF->ConfigSpec testing
64ddc2b 
This patch adds many more OVF fixtures to validate
ovf.ToConfigSpec.

Signed-off-by: akutz <andrew.kutz@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
Merge pull request vmware#3980 from akutz/feature/more-ovf-testing
c7ae905 
api: More OVF testing
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@hpannem @aruneshpa
ovf spec parser for dmtf os types
be14641 
Signed-off-by: Hemanth kumar Pannem <hemanth-kumar.pannem@broadcom.com>
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@akutz @aruneshpa
Merge pull request vmware#3981 from hpannem/ovfgosparse
9381829 
fix: OVF spec parser for DMTF os types
Signed-off-by: Arunesh Pandey <arunesh-kumar.pandey@broadcom.com>
@aruneshpa aruneshpa force-pushed the topic/vm-op-ovf-cherry-picks branch from a60f7a5 to 9381829 Compare March 17, 2026 20:43
@akutz akutz merged commit e2554e7 into vmware:vm-operator-vc-9.1.0 Mar 17, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akutz akutz akutz approved these changes

+1 more reviewer

@faisalabujabal faisalabujabal faisalabujabal approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@aruneshpa @akutz @faisalabujabal @hpannem
⚡