rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-18 08:06:48 +00:00
Code Issues Releases Wiki Activity

cloudinit tests pass :)

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-02-23 01:29:01 +00:00
parent 4f177ee605
commit be2c4044ce
72 changed files with 2683 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/cloudinit/datasource/waagent/waagent.go
View File

@@ -25,29 +25,29 @@ import (
"github.com/rancher/os/config/cloudinit/datasource"
)
type waagent struct {
type Waagent struct {
root string
readFile func(filename string) ([]byte, error)
}
func NewDatasource(root string) *waagent {
return &waagent{root, ioutil.ReadFile}
func NewDatasource(root string) *Waagent {
return &Waagent{root, ioutil.ReadFile}
}
func (a *waagent) IsAvailable() bool {
func (a *Waagent) IsAvailable() bool {
_, err := os.Stat(path.Join(a.root, "provisioned"))
return !os.IsNotExist(err)
}
func (a *waagent) AvailabilityChanges() bool {
func (a *Waagent) AvailabilityChanges() bool {
return true
}
func (a *waagent) ConfigRoot() string {
func (a *Waagent) ConfigRoot() string {
return a.root
}
func (a *waagent) FetchMetadata() (metadata datasource.Metadata, err error) {
func (a *Waagent) FetchMetadata() (metadata datasource.Metadata, err error) {
var metadataBytes []byte
if metadataBytes, err = a.tryReadFile(path.Join(a.root, "SharedConfig.xml")); err != nil {
return
@@ -57,7 +57,7 @@ func (a *waagent) FetchMetadata() (metadata datasource.Metadata, err error) {
}
type Instance struct {
Id string `xml:"id,attr"`
ID string `xml:"id,attr"`
Address string `xml:"address,attr"`
InputEndpoints struct {
Endpoints []struct {
@@ -82,7 +82,7 @@ func (a *waagent) FetchMetadata() (metadata datasource.Metadata, err error) {
var instance Instance
for _, i := range m.Instances.Instances {
if i.Id == m.Incarnation.Instance {
if i.ID == m.Incarnation.Instance {
instance = i
break
}
@@ -99,15 +99,15 @@ func (a *waagent) FetchMetadata() (metadata datasource.Metadata, err error) {
return
}
func (a *waagent) FetchUserdata() ([]byte, error) {
func (a *Waagent) FetchUserdata() ([]byte, error) {
return a.tryReadFile(path.Join(a.root, "CustomData"))
}
func (a *waagent) Type() string {
return "waagent"
func (a *Waagent) Type() string {
return "Waagent"
}
func (a *waagent) tryReadFile(filename string) ([]byte, error) {
func (a *Waagent) tryReadFile(filename string) ([]byte, error) {
log.Printf("Attempting to read from %q\n", filename)
data, err := a.readFile(filename)
if os.IsNotExist(err) {

26
config/cloudinit/datasource/waagent/waagent_test.go
View File

@@ -38,12 +38,12 @@ func TestFetchMetadata(t *testing.T) {
files: test.NewMockFilesystem(test.File{Path: "/SharedConfig.xml", Contents: ""}),
},
{
root: "/var/lib/waagent",
files: test.NewMockFilesystem(test.File{Path: "/var/lib/waagent/SharedConfig.xml", Contents: ""}),
root: "/var/lib/Waagent",
files: test.NewMockFilesystem(test.File{Path: "/var/lib/Waagent/SharedConfig.xml", Contents: ""}),
},
{
root: "/var/lib/waagent",
files: test.NewMockFilesystem(test.File{Path: "/var/lib/waagent/SharedConfig.xml", Contents: `<?xml version="1.0" encoding="utf-8"?>
root: "/var/lib/Waagent",
files: test.NewMockFilesystem(test.File{Path: "/var/lib/Waagent/SharedConfig.xml", Contents: `<?xml version="1.0" encoding="utf-8"?>
<SharedConfig version="1.0.0.0" goalStateIncarnation="1">
<Deployment name="c8f9e4c9c18948e1bebf57c5685da756" guid="{1d10394f-c741-4a1a-a6bb-278f213c5a5e}" incarnation="0" isNonCancellableTopologyChangeEnabled="false">
<Service name="core-test-1" guid="{00000000-0000-0000-0000-000000000000}" />
@@ -86,7 +86,7 @@ func TestFetchMetadata(t *testing.T) {
},
},
} {
a := waagent{tt.root, tt.files.ReadFile}
a := Waagent{tt.root, tt.files.ReadFile}
metadata, err := a.FetchMetadata()
if err != nil {
t.Fatalf("bad error for %+v: want %v, got %q", tt, nil, err)
@@ -111,11 +111,11 @@ func TestFetchUserdata(t *testing.T) {
test.NewMockFilesystem(test.File{Path: "/CustomData", Contents: ""}),
},
{
"/var/lib/waagent/",
test.NewMockFilesystem(test.File{Path: "/var/lib/waagent/CustomData", Contents: ""}),
"/var/lib/Waagent/",
test.NewMockFilesystem(test.File{Path: "/var/lib/Waagent/CustomData", Contents: ""}),
},
} {
a := waagent{tt.root, tt.files.ReadFile}
a := Waagent{tt.root, tt.files.ReadFile}
_, err := a.FetchUserdata()
if err != nil {
t.Fatalf("bad error for %+v: want %v, got %q", tt, nil, err)
@@ -133,11 +133,11 @@ func TestConfigRoot(t *testing.T) {
"/",
},
{
"/var/lib/waagent",
"/var/lib/waagent",
"/var/lib/Waagent",
"/var/lib/Waagent",
},
} {
a := waagent{tt.root, nil}
a := Waagent{tt.root, nil}
if configRoot := a.ConfigRoot(); configRoot != tt.configRoot {
t.Fatalf("bad config root for %q: want %q, got %q", tt, tt.configRoot, configRoot)
}
@@ -154,8 +154,8 @@ func TestNewDatasource(t *testing.T) {
expectRoot: "",
},
{
root: "/var/lib/waagent",
expectRoot: "/var/lib/waagent",
root: "/var/lib/Waagent",
expectRoot: "/var/lib/Waagent",
},
} {
service := NewDatasource(tt.root)