Skip to content

support defining the network ip allocation mode when composing a vApp #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
onmomo wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

support defining the network ip allocation mode when composing a vApp #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2a0026
support defining the network ip allocation mode when composing a vApp
onmomo Nov 10, 2017
f5f70d1
add missing type
onmomo Nov 10, 2017
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
6 changes: 6 additions & 0 deletions types/v56/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ var VDCStatuses = map[int]string{
3: "UNRECOGNIZED",
}

// Defines the network and IP mode (POOL, DHCP, MANUAL) for a VM NIC adapter
type VAppVDCNetworkAllocation struct {
VAppNetwork *OrgVDCNetwork
IPAddressAllocationMode string
}

// VCD API

// DefaultStorageProfileSection is the name of the storage profile that will be specified for this virtual machine. The named storage profile must exist in the organization vDC that contains the virtual machine. If not specified, the default storage profile for the vDC is used.
Expand Down
22 changes: 11 additions & 11 deletions vapp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ func (v *VApp) RemoveVM(vm VM) error {
return nil
}

func (v *VApp) ComposeVApp(orgvdcnetworks []*types.OrgVDCNetwork, vapptemplate VAppTemplate, storageprofileref types.Reference, name string, description string) (Task, error) {
func (v *VApp) ComposeVApp(networkAllocations []types.VAppVDCNetworkAllocation, vapptemplate VAppTemplate, storageprofileref types.Reference, name string, description string) (Task, error) {

if vapptemplate.VAppTemplate.Children == nil || orgvdcnetworks == nil {
if vapptemplate.VAppTemplate.Children == nil || networkAllocations == nil {
return Task{}, fmt.Errorf("can't compose a new vApp, objects passed are not valid")
}

Expand Down Expand Up @@ -220,32 +220,32 @@ func (v *VApp) ComposeVApp(orgvdcnetworks []*types.OrgVDCNetwork, vapptemplate V
},
}

for index, orgvdcnetwork := range orgvdcnetworks {
for index, vAppVDCNetworkAllocation := range networkAllocations {
vcomp.InstantiationParams.NetworkConfigSection.NetworkConfig = append(vcomp.InstantiationParams.NetworkConfigSection.NetworkConfig,
types.VAppNetworkConfiguration{
NetworkName: orgvdcnetwork.Name,
NetworkName: vAppVDCNetworkAllocation.VAppNetwork.Name,
Configuration: &types.NetworkConfiguration{
FenceMode: "bridged",
ParentNetwork: &types.Reference{
HREF: orgvdcnetwork.HREF,
Name: orgvdcnetwork.Name,
Type: orgvdcnetwork.Type,
HREF: vAppVDCNetworkAllocation.VAppNetwork.HREF,
Name: vAppVDCNetworkAllocation.VAppNetwork.Name,
Type: vAppVDCNetworkAllocation.VAppNetwork.Type,
},
},
},
)
vcomp.SourcedItem.InstantiationParams.NetworkConnectionSection.NetworkConnection = append(vcomp.SourcedItem.InstantiationParams.NetworkConnectionSection.NetworkConnection,
&types.NetworkConnection{
Network: orgvdcnetwork.Name,
Network: vAppVDCNetworkAllocation.VAppNetwork.Name,
NetworkConnectionIndex: index,
IsConnected: true,
IPAddressAllocationMode: "POOL",
IPAddressAllocationMode: vAppVDCNetworkAllocation.IPAddressAllocationMode,
},
)
vcomp.SourcedItem.NetworkAssignment = append(vcomp.SourcedItem.NetworkAssignment,
&types.NetworkAssignment{
InnerNetwork: orgvdcnetwork.Name,
ContainerNetwork: orgvdcnetwork.Name,
InnerNetwork: vAppVDCNetworkAllocation.VAppNetwork.Name,
ContainerNetwork: vAppVDCNetworkAllocation.VAppNetwork.Name,
},
)
}
Expand Down
48 changes: 24 additions & 24 deletions vapp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ func (s *S) Test_ComposeVApp(c *C) {
c.Assert(err, IsNil)

// Populate OrgVDCNetwork
networks := []*types.OrgVDCNetwork{}
net, err := s.vdc.FindVDCNetwork("networkName")
networks = append(networks, net.OrgVDCNetwork)
vAppVDCNetworkAllocationMode := types.VAppVDCNetworkAllocation{VAppNetwork: net.OrgVDCNetwork, IPAddressAllocationMode: "POOL"}
networkAllocations := []types.VAppVDCNetworkAllocation{vAppVDCNetworkAllocationMode}
c.Assert(err, IsNil)

// Populate Catalog
Expand All @@ -50,7 +50,7 @@ func (s *S) Test_ComposeVApp(c *C) {
c.Assert(err, IsNil)

// Compose VApp
task, err := s.vapp.ComposeVApp(networks, vapptemplate, storageprofileref, "name", "description")
task, err := s.vapp.ComposeVApp(networkAllocations, vapptemplate, storageprofileref, "name", "description")
c.Assert(err, IsNil)
c.Assert(task.Task.OperationName, Equals, "vdcInstantiateVapp")
c.Assert(s.vapp.VApp.HREF, Equals, "http://localhost:4444/api/vApp/vapp-00000000-0000-0000-0000-000000000000")
Expand Down Expand Up @@ -114,9 +114,9 @@ func (s *S) Test_SetOvf(c *C) {
c.Assert(err, IsNil)

// Populate OrgVDCNetwork
networks := []*types.OrgVDCNetwork{}
net, err := s.vdc.FindVDCNetwork("networkName")
networks = append(networks, net.OrgVDCNetwork)
vAppVDCNetworkAllocationMode := types.VAppVDCNetworkAllocation{VAppNetwork: net.OrgVDCNetwork, IPAddressAllocationMode: "POOL"}
networkAllocations := []types.VAppVDCNetworkAllocation{vAppVDCNetworkAllocationMode}
c.Assert(err, IsNil)

// Populate Catalog
Expand All @@ -136,7 +136,7 @@ func (s *S) Test_SetOvf(c *C) {
c.Assert(err, IsNil)

// Compose VApp
task, err := s.vapp.ComposeVApp(networks, vapptemplate, storageprofileref, "name", "description")
task, err := s.vapp.ComposeVApp(networkAllocations, vapptemplate, storageprofileref, "name", "description")
c.Assert(err, IsNil)
c.Assert(task.Task.OperationName, Equals, "vdcInstantiateVapp")
c.Assert(s.vapp.VApp.HREF, Equals, "http://localhost:4444/api/vApp/vapp-00000000-0000-0000-0000-000000000000")
Expand Down Expand Up @@ -170,9 +170,9 @@ func (s *S) Test_AddMetadata(c *C) {
c.Assert(err, IsNil)

// Populate OrgVDCNetwork
networks := []*types.OrgVDCNetwork{}
net, err := s.vdc.FindVDCNetwork("networkName")
networks = append(networks, net.OrgVDCNetwork)
vAppVDCNetworkAllocationMode := types.VAppVDCNetworkAllocation{VAppNetwork: net.OrgVDCNetwork, IPAddressAllocationMode: "POOL"}
networkAllocations := []types.VAppVDCNetworkAllocation{vAppVDCNetworkAllocationMode}
c.Assert(err, IsNil)

// Populate Catalog
Expand All @@ -192,7 +192,7 @@ func (s *S) Test_AddMetadata(c *C) {
c.Assert(err, IsNil)

// Compose VApp
task, err := s.vapp.ComposeVApp(networks, vapptemplate, storageprofileref, "name", "description")
task, err := s.vapp.ComposeVApp(networkAllocations, vapptemplate, storageprofileref, "name", "description")
c.Assert(err, IsNil)
c.Assert(task.Task.OperationName, Equals, "vdcInstantiateVapp")
c.Assert(s.vapp.VApp.HREF, Equals, "http://localhost:4444/api/vApp/vapp-00000000-0000-0000-0000-000000000000")
Expand Down Expand Up @@ -225,9 +225,9 @@ func (s *S) Test_ChangeStorageProfile(c *C) {
c.Assert(err, IsNil)

// Populate OrgVDCNetwork
networks := []*types.OrgVDCNetwork{}
net, err := s.vdc.FindVDCNetwork("networkName")
networks = append(networks, net.OrgVDCNetwork)
vAppVDCNetworkAllocationMode := types.VAppVDCNetworkAllocation{VAppNetwork: net.OrgVDCNetwork, IPAddressAllocationMode: "POOL"}
networkAllocations := []types.VAppVDCNetworkAllocation{vAppVDCNetworkAllocationMode}
c.Assert(err, IsNil)

// Populate Catalog
Expand All @@ -247,7 +247,7 @@ func (s *S) Test_ChangeStorageProfile(c *C) {
c.Assert(err, IsNil)

// Compose VApp
task, err := s.vapp.ComposeVApp(networks, vapptemplate, storageprofileref, "name", "description")
task, err := s.vapp.ComposeVApp(networkAllocations, vapptemplate, storageprofileref, "name", "description")
c.Assert(err, IsNil)
c.Assert(task.Task.OperationName, Equals, "vdcInstantiateVapp")
c.Assert(s.vapp.VApp.HREF, Equals, "http://localhost:4444/api/vApp/vapp-00000000-0000-0000-0000-000000000000")
Expand Down Expand Up @@ -279,9 +279,9 @@ func (s *S) Test_ChangeVMName(c *C) {
c.Assert(err, IsNil)

// Populate OrgVDCNetwork
networks := []*types.OrgVDCNetwork{}
net, err := s.vdc.FindVDCNetwork("networkName")
networks = append(networks, net.OrgVDCNetwork)
vAppVDCNetworkAllocationMode := types.VAppVDCNetworkAllocation{VAppNetwork: net.OrgVDCNetwork, IPAddressAllocationMode: "POOL"}
networkAllocations := []types.VAppVDCNetworkAllocation{vAppVDCNetworkAllocationMode}
c.Assert(err, IsNil)

// Populate Catalog
Expand All @@ -301,7 +301,7 @@ func (s *S) Test_ChangeVMName(c *C) {
c.Assert(err, IsNil)

// Compose VApp
task, err := s.vapp.ComposeVApp(networks, vapptemplate, storageprofileref, "name", "description")
task, err := s.vapp.ComposeVApp(networkAllocations, vapptemplate, storageprofileref, "name", "description")
c.Assert(err, IsNil)
c.Assert(task.Task.OperationName, Equals, "vdcInstantiateVapp")
c.Assert(s.vapp.VApp.HREF, Equals, "http://localhost:4444/api/vApp/vapp-00000000-0000-0000-0000-000000000000")
Expand Down Expand Up @@ -399,9 +399,9 @@ func (s *S) Test_RunCustomizationScript(c *C) {
c.Assert(err, IsNil)

// Populate OrgVDCNetwork
networks := []*types.OrgVDCNetwork{}
net, err := s.vdc.FindVDCNetwork("networkName")
networks = append(networks, net.OrgVDCNetwork)
vAppVDCNetworkAllocationMode := types.VAppVDCNetworkAllocation{VAppNetwork: net.OrgVDCNetwork, IPAddressAllocationMode: "POOL"}
networkAllocations := []types.VAppVDCNetworkAllocation{vAppVDCNetworkAllocationMode}
c.Assert(err, IsNil)

// Populate Catalog
Expand All @@ -421,7 +421,7 @@ func (s *S) Test_RunCustomizationScript(c *C) {
c.Assert(err, IsNil)

// Compose VApp
task, err := s.vapp.ComposeVApp(networks, vapptemplate, storageprofileref, "name", "description")
task, err := s.vapp.ComposeVApp(networkAllocations, vapptemplate, storageprofileref, "name", "description")
c.Assert(err, IsNil)
c.Assert(task.Task.OperationName, Equals, "vdcInstantiateVapp")
c.Assert(s.vapp.VApp.HREF, Equals, "http://localhost:4444/api/vApp/vapp-00000000-0000-0000-0000-000000000000")
Expand Down Expand Up @@ -453,9 +453,9 @@ func (s *S) Test_ChangeCPUcount(c *C) {
c.Assert(err, IsNil)

// Populate OrgVDCNetwork
networks := []*types.OrgVDCNetwork{}
net, err := s.vdc.FindVDCNetwork("networkName")
networks = append(networks, net.OrgVDCNetwork)
vAppVDCNetworkAllocationMode := types.VAppVDCNetworkAllocation{VAppNetwork: net.OrgVDCNetwork, IPAddressAllocationMode: "POOL"}
networkAllocations := []types.VAppVDCNetworkAllocation{vAppVDCNetworkAllocationMode}
c.Assert(err, IsNil)

// Populate Catalog
Expand All @@ -475,7 +475,7 @@ func (s *S) Test_ChangeCPUcount(c *C) {
c.Assert(err, IsNil)

// Compose VApp
task, err := s.vapp.ComposeVApp(networks, vapptemplate, storageprofileref, "name", "description")
task, err := s.vapp.ComposeVApp(networkAllocations, vapptemplate, storageprofileref, "name", "description")
c.Assert(err, IsNil)
c.Assert(task.Task.OperationName, Equals, "vdcInstantiateVapp")
c.Assert(s.vapp.VApp.HREF, Equals, "http://localhost:4444/api/vApp/vapp-00000000-0000-0000-0000-000000000000")
Expand Down Expand Up @@ -507,9 +507,9 @@ func (s *S) Test_ChangeMemorySize(c *C) {
c.Assert(err, IsNil)

// Populate OrgVDCNetwork
networks := []*types.OrgVDCNetwork{}
net, err := s.vdc.FindVDCNetwork("networkName")
networks = append(networks, net.OrgVDCNetwork)
vAppVDCNetworkAllocationMode := types.VAppVDCNetworkAllocation{VAppNetwork: net.OrgVDCNetwork, IPAddressAllocationMode: "POOL"}
networkAllocations := []types.VAppVDCNetworkAllocation{vAppVDCNetworkAllocationMode}
c.Assert(err, IsNil)

// Populate Catalog
Expand All @@ -529,7 +529,7 @@ func (s *S) Test_ChangeMemorySize(c *C) {
c.Assert(err, IsNil)

// Compose VApp
task, err := s.vapp.ComposeVApp(networks, vapptemplate, storageprofileref, "name", "description")
task, err := s.vapp.ComposeVApp(networkAllocations, vapptemplate, storageprofileref, "name", "description")
c.Assert(err, IsNil)
c.Assert(task.Task.OperationName, Equals, "vdcInstantiateVapp")
c.Assert(s.vapp.VApp.HREF, Equals, "http://localhost:4444/api/vApp/vapp-00000000-0000-0000-0000-000000000000")
Expand Down