github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 07:03:31 +00:00
Code Issues Projects Releases Wiki Activity

fix non-gofmt'd things

Browse Source
This commit is contained in:
Daniel Smith
2014-09-24 14:27:10 -07:00
parent 50eb2cf59c
commit bb0cd95a83
11 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cloudprovider/aws/aws_test.go
View File

@@ -89,20 +89,20 @@ func mockInstancesResp(instances []ec2.Instance) (aws *AWSCloud) {
func(instanceIds []string, filter *ec2.Filter) (resp *ec2.InstancesResp, err error) {
return &ec2.InstancesResp{"",
[]ec2.Reservation{
ec2.Reservation{"", "", "", nil, instances}}}, nil
{"", "", "", nil, instances}}}, nil
}},
nil}
}
func TestList(t *testing.T) {
instances := make([]ec2.Instance, 4)
instances[0].Tags = []ec2.Tag{ec2.Tag{"Name", "foo"}}
instances[0].Tags = []ec2.Tag{{"Name", "foo"}}
instances[0].PrivateDNSName = "instance1"
instances[1].Tags = []ec2.Tag{ec2.Tag{"Name", "bar"}}
instances[1].Tags = []ec2.Tag{{"Name", "bar"}}
instances[1].PrivateDNSName = "instance2"
instances[2].Tags = []ec2.Tag{ec2.Tag{"Name", "baz"}}
instances[2].Tags = []ec2.Tag{{"Name", "baz"}}
instances[2].PrivateDNSName = "instance3"
instances[3].Tags = []ec2.Tag{ec2.Tag{"Name", "quux"}}
instances[3].Tags = []ec2.Tag{{"Name", "quux"}}
instances[3].PrivateDNSName = "instance4"
aws := mockInstancesResp(instances)

24
pkg/cloudprovider/ovirt/ovirt.go
View File

@@ -18,9 +18,9 @@ package ovirt_cloud
import (
"encoding/xml"
"fmt"
"io"
"io/ioutil"
"fmt"
"net"
"net/http"
"net/url"
@@ -32,8 +32,8 @@ import (
)
type OVirtCloud struct {
VmsRequest *url.URL
HostsRequest *url.URL
VmsRequest *url.URL
HostsRequest *url.URL
}
type OVirtApiConfig struct {
@@ -43,18 +43,18 @@ type OVirtApiConfig struct {
Password string `gcfg:"password"`
}
Filters struct {
VmsQuery string `gcfg:"vms"`
VmsQuery string `gcfg:"vms"`
}
}
type XmlVmInfo struct {
Hostname string `xml:"guest_info>fqdn"`
State string `xml:"status>state"`
Hostname string `xml:"guest_info>fqdn"`
State string `xml:"status>state"`
}
type XmlVmsList struct {
XMLName xml.Name `xml:"vms"`
Vm []XmlVmInfo `xml:"vm"`
XMLName xml.Name `xml:"vms"`
Vm []XmlVmInfo `xml:"vm"`
}
func init() {
@@ -74,7 +74,7 @@ func newOVirtCloud(config io.Reader) (*OVirtCloud, error) {
/* defaults */
oVirtConfig.Connection.Username = "admin@internal"
if err := gcfg.ReadInto(&oVirtConfig, config); err != nil {
if err := gcfg.ReadInto(&oVirtConfig, config); err != nil {
return nil, err
}
@@ -83,7 +83,7 @@ func newOVirtCloud(config io.Reader) (*OVirtCloud, error) {
}
request, err := url.Parse(oVirtConfig.Connection.ApiEntry)
if err != nil {
if err != nil {
return nil, err
}
@@ -121,7 +121,7 @@ func getInstancesFromXml(body io.Reader) ([]string, error) {
}
content, err := ioutil.ReadAll(body)
if err != nil {
if err != nil {
return nil, err
}
@@ -146,7 +146,7 @@ func getInstancesFromXml(body io.Reader) ([]string, error) {
// List enumerates the set of minions instances known by the cloud provider
func (v *OVirtCloud) List(filter string) ([]string, error) {
response, err := http.Get(v.VmsRequest.String())
if err != nil {
if err != nil {
return nil, err
}