Skip to content

Set ComputerName for ComposeVApp #17

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

Open
harmjanblok wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Set ComputerName for ComposeVApp #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6eab26d
Inherit GuestCustomizations from VAppTemplate
harmjanblok Feb 15, 2018
3862117
Set VM ComputerName to VApp name
harmjanblok Feb 15, 2018
e222b96
Match case with actual git repository name
harmjanblok Nov 11, 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
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# govcloudair [![Build Status](https://ci.vmware.run/api/badges/ukcloud/govcloudair/status.svg)](https://ci.vmware.run/ukcloud/govcloudair) [![Build Status](https://travis-ci.org/ukcloud/govcloudair.svg?branch=master)](https://travis-ci.org/ukcloud/govcloudair) [![Coverage Status](https://coveralls.io/repos/ukcloud/govcloudair/badge.svg?branch=master&service=github)](https://coveralls.io/github/ukcloud/govcloudair?branch=master) [![GoDoc](https://godoc.org/github.com/ukcloud/govcloudair?status.svg)](http://godoc.org/github.com/ukcloud/govcloudair) [![Join the chat at https://gitter.im/ukcloud/govcloudair](https://badges.gitter.im/ukcloud/govcloudair.svg)](https://gitter.im/ukcloud/govcloudair?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
# govcloudair [![Build Status](https://ci.vmware.run/api/badges/ukcloud/govcloudair/status.svg)](https://ci.vmware.run/ukcloud/govcloudair) [![Build Status](https://travis-ci.org/UKCloud/govcloudair.svg?branch=master)](https://travis-ci.org/UKCloud/govcloudair) [![Coverage Status](https://coveralls.io/repos/ukcloud/govcloudair/badge.svg?branch=master&service=github)](https://coveralls.io/github/ukcloud/govcloudair?branch=master) [![GoDoc](https://godoc.org/github.com/UKCloud/govcloudair?status.svg)](http://godoc.org/github.com/UKCloud/govcloudair) [![Join the chat at https://gitter.im/ukcloud/govcloudair](https://badges.gitter.im/ukcloud/govcloudair.svg)](https://gitter.im/ukcloud/govcloudair?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
This repo provides the `govcloudair` package which offers an interface to the vCloud Air 5.6 and 5.7 API and vCloud Director 5.5 API.

It serves as a foundation for a project currently in development, there are plans to make it a general purpose API in the future. The `govcloudair` package is used by the Terraform provider for vCloud Director.
Expand All @@ -17,7 +17,7 @@ import (
"net/url"
"os"

govcd "github.com/ukcloud/govcloudair"
govcd "github.com/UKCloud/govcloudair"
)

type Config struct {
Expand Down Expand Up @@ -62,4 +62,3 @@ func main() {
fmt.Printf("Org URL: %s\n", client.OrgHREF.String())
}
```

2 changes: 1 addition & 1 deletion api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"net/http"
"net/url"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

// Client provides a client to vCloud Air, values can be populated automatically using the Authenticate method.
Expand Down
2 changes: 1 addition & 1 deletion api_vca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"os"
"time"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

// Client provides a client to vCloud Air, values can be populated automatically using the Authenticate method.
Expand Down
2 changes: 1 addition & 1 deletion api_vca_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"os"
"testing"

"github.com/ukcloud/govcloudair/testutil"
"github.com/UKCloud/govcloudair/testutil"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion api_vcd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/url"
"testing"

"github.com/ukcloud/govcloudair/testutil"
"github.com/UKCloud/govcloudair/testutil"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"net/url"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

type Catalog struct {
Expand Down
2 changes: 1 addition & 1 deletion catalogitem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"net/url"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

type CatalogItem struct {
Expand Down
2 changes: 1 addition & 1 deletion edgegateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"regexp"
"time"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

type EdgeGateway struct {
Expand Down
4 changes: 2 additions & 2 deletions edgegateway_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package govcloudair

import (
"github.com/ukcloud/govcloudair/testutil"
types "github.com/ukcloud/govcloudair/types/v56"
"github.com/UKCloud/govcloudair/testutil"
types "github.com/UKCloud/govcloudair/types/v56"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"net/url"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

type Org struct {
Expand Down
2 changes: 1 addition & 1 deletion orgvdcnetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"bytes"
"encoding/xml"
"fmt"
types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
"log"
"net/http"
"net/url"
Expand Down
2 changes: 1 addition & 1 deletion orgvdcnetwork_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package govcloudair

import (
"github.com/ukcloud/govcloudair/testutil"
"github.com/UKCloud/govcloudair/testutil"

. "gopkg.in/check.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package govcloudair
import (
"fmt"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

type Results struct {
Expand Down
2 changes: 1 addition & 1 deletion query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package govcloudair

import (
// "fmt"
"github.com/ukcloud/govcloudair/testutil"
"github.com/UKCloud/govcloudair/testutil"
. "gopkg.in/check.v1"
)

Expand Down
2 changes: 1 addition & 1 deletion task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"net/url"
"time"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

type Task struct {
Expand Down
9 changes: 5 additions & 4 deletions types/v56/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,10 +891,11 @@ type VAppTemplate struct {
// CustomizationSection at least, NetworkConnectionSection is required when
// using ComposeVApp action in the context of a Children VM (still
// referenced by VAppTemplateType).
NetworkConfigSection *NetworkConfigSection `xml:"NetworkConfigSection,omitempty"`
NetworkConnectionSection *NetworkConnectionSection `xml:"NetworkConnectionSection,omitempty"`
LeaseSettingsSection *LeaseSettingsSection `xml:"LeaseSettingsSection,omitempty"`
CustomizationSection *CustomizationSection `xml:"CustomizationSection,omitempty"`
NetworkConfigSection *NetworkConfigSection `xml:"NetworkConfigSection,omitempty"`
NetworkConnectionSection *NetworkConnectionSection `xml:"NetworkConnectionSection,omitempty"`
LeaseSettingsSection *LeaseSettingsSection `xml:"LeaseSettingsSection,omitempty"`
CustomizationSection *CustomizationSection `xml:"CustomizationSection,omitempty"`
GuestCustomizationSection *GuestCustomizationSection `xml:"GuestCustomizationSection,omitempty"`
// OVF Section needs to be added
// Section Section `xml:"Section,omitempty"`
}
Expand Down
2 changes: 1 addition & 1 deletion v57/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"time"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

const (
Expand Down
12 changes: 11 additions & 1 deletion vapp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"net/url"
"os"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
"strconv"
)

Expand Down Expand Up @@ -210,13 +210,23 @@ func (v *VApp) ComposeVApp(orgvdcnetworks []*types.OrgVDCNetwork, vapptemplate V
Name: vapptemplate.VAppTemplate.Children.VM[0].Name,
},
InstantiationParams: &types.InstantiationParams{
GuestCustomizationSection: &types.GuestCustomizationSection{
Type: vapptemplate.VAppTemplate.Children.VM[0].GuestCustomizationSection.Type,
HREF: vapptemplate.VAppTemplate.Children.VM[0].GuestCustomizationSection.HREF,
Info: "Guest customization for sourced item",
ComputerName: name,
Enabled: vapptemplate.VAppTemplate.Children.VM[0].GuestCustomizationSection.Enabled,
},
NetworkConnectionSection: &types.NetworkConnectionSection{
Type: vapptemplate.VAppTemplate.Children.VM[0].NetworkConnectionSection.Type,
HREF: vapptemplate.VAppTemplate.Children.VM[0].NetworkConnectionSection.HREF,
Info: "Network config for sourced item",
PrimaryNetworkConnectionIndex: vapptemplate.VAppTemplate.Children.VM[0].NetworkConnectionSection.PrimaryNetworkConnectionIndex,
},
},
VMGeneralParams: &types.VMGeneralParams{
Name: name,
},
},
}

Expand Down
4 changes: 2 additions & 2 deletions vapp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package govcloudair

import (
"github.com/ukcloud/govcloudair/testutil"
"github.com/ukcloud/govcloudair/types/v56"
"github.com/UKCloud/govcloudair/testutil"
"github.com/UKCloud/govcloudair/types/v56"

. "gopkg.in/check.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion vapptemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"bytes"
"encoding/xml"
"fmt"
types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

type VAppTemplate struct {
Expand Down
2 changes: 1 addition & 1 deletion vdc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"bytes"
"encoding/xml"
"fmt"
types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
"log"
"net/url"
"os"
Expand Down
2 changes: 1 addition & 1 deletion vdc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package govcloudair

import (
"github.com/ukcloud/govcloudair/testutil"
"github.com/UKCloud/govcloudair/testutil"

. "gopkg.in/check.v1"
"strconv"
Expand Down
2 changes: 1 addition & 1 deletion vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"os"
"strconv"

types "github.com/ukcloud/govcloudair/types/v56"
types "github.com/UKCloud/govcloudair/types/v56"
)

type VM struct {
Expand Down
2 changes: 1 addition & 1 deletion vm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package govcloudair

import (
// "fmt"
"github.com/ukcloud/govcloudair/testutil"
"github.com/UKCloud/govcloudair/testutil"
. "gopkg.in/check.v1"
)

Expand Down