Add VirtualHardwareSection.StorageItem

Within VirtualHardwareSection, we've noticed that some ovfs reference disks using Item nodes, while others use StorageItem nodes. This adds a definition for StorageItem nodes. Fixes vmware#1606
misterikkit · Sep 13, 2019 · d84679e · d84679e
1 parent 3dbba02
commit d84679e
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # changelog
 
+### 0.22.0 (2019-09-13)
+
+* Add VirtualHardwareSection.StorageItem
+
 ### 0.21.0 (2019-07-24)
 
 * Add vsan package

diff --git a/govc/flags/version.go b/govc/flags/version.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 )
 
-const Version = "0.21.0"
+const Version = "0.22.0"
 
 var GitVersion string
 

diff --git a/ovf/cim.go b/ovf/cim.go
@@ -16,6 +16,10 @@ limitations under the License.
 
 package ovf
 
+import (
+	"github.com/vmware/govmomi/vim25/types"
+)
+
 /*
 Source: http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.24.0/CIM_VirtualSystemSettingData.xsd
 */
@@ -76,3 +80,49 @@ type CIMResourceAllocationSettingData struct {
 	VirtualQuantityUnits  *string  `xml:"VirtualQuantityUnits"`
 	Weight                *uint    `xml:"Weight"`
 }
+
+/*
+Source: http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.24.0/CIM_StorageAllocationSettingData.xsd
+*/
+type CIMStorageAllocationSettingData struct {
+	ElementName string `xml:"ElementName"`
+	InstanceID  string `xml:"InstanceID"`
+
+	ResourceType      *uint16 `xml:"ResourceType"`
+	OtherResourceType *string `xml:"OtherResourceType"`
+	ResourceSubType   *string `xml:"ResourceSubType"`
+
+	Access                       *uint16         `xml:"Access"`
+	Address                      *string         `xml:"Address"`
+	AddressOnParent              *string         `xml:"AddressOnParent"`
+	AllocationUnits              *string         `xml:"AllocationUnits"`
+	AutomaticAllocation          *bool           `xml:"AutomaticAllocation"`
+	AutomaticDeallocation        *bool           `xml:"AutomaticDeallocation"`
+	Caption                      *string         `xml:"Caption"`
+	ChangeableType               *uint16         `xml:"ChangeableType"`
+	ComponentSetting             []types.AnyType `xml:"ComponentSetting"`
+	ConfigurationName            *string         `xml:"ConfigurationName"`
+	Connection                   []string        `xml:"Connection"`
+	ConsumerVisibility           *uint16         `xml:"ConsumerVisibility"`
+	Description                  *string         `xml:"Description"`
+	Generation                   *uint64         `xml:"Generation"`
+	HostExtentName               *string         `xml:"HostExtentName"`
+	HostExtentNameFormat         *uint16         `xml:"HostExtentNameFormat"`
+	HostExtentNameNamespace      *uint16         `xml:"HostExtentNameNamespace"`
+	HostExtentStartingAddress    *uint64         `xml:"HostExtentStartingAddress"`
+	HostResource                 []string        `xml:"HostResource"`
+	HostResourceBlockSize        *uint64         `xml:"HostResourceBlockSize"`
+	Limit                        *uint64         `xml:"Limit"`
+	MappingBehavior              *uint           `xml:"MappingBehavior"`
+	OtherHostExtentNameFormat    *string         `xml:"OtherHostExtentNameFormat"`
+	OtherHostExtentNameNamespace *string         `xml:"OtherHostExtentNameNamespace"`
+	Parent                       *string         `xml:"Parent"`
+	PoolID                       *string         `xml:"PoolID"`
+	Reservation                  *uint64         `xml:"Reservation"`
+	SoID                         *string         `xml:"SoID"`
+	SoOrgID                      *string         `xml:"SoOrgID"`
+	VirtualQuantity              *uint           `xml:"VirtualQuantity"`
+	VirtualQuantityUnits         *string         `xml:"VirtualQuantityUnits"`
+	VirtualResourceBlockSize     *uint64         `xml:"VirtualResourceBlockSize"`
+	Weight                       *uint           `xml:"Weight"`
+}
diff --git a/ovf/envelope.go b/ovf/envelope.go
@@ -154,8 +154,9 @@ type VirtualHardwareSection struct {
 	ID        *string `xml:"id,attr"`
 	Transport *string `xml:"transport,attr"`
 
-	System *VirtualSystemSettingData       `xml:"System"`
-	Item   []ResourceAllocationSettingData `xml:"Item"`
+	System      *VirtualSystemSettingData       `xml:"System"`
+	Item        []ResourceAllocationSettingData `xml:"Item"`
+	StorageItem []StorageAllocationSettingData  `xml:"StorageItem"`
 }
 
 type VirtualSystemSettingData struct {
@@ -170,6 +171,14 @@ type ResourceAllocationSettingData struct {
 	Bound         *string `xml:"bound,attr"`
 }
 
+type StorageAllocationSettingData struct {
+	CIMStorageAllocationSettingData
+
+	Required      *bool   `xml:"required,attr"`
+	Configuration *string `xml:"configuration,attr"`
+	Bound         *string `xml:"bound,attr"`
+}
+
 type ResourceAllocationSection struct {
 	Section