configdrive: fix root path

This commit is contained in:
Alex Crawford 2014-08-11 17:57:10 -07:00
parent facde6609f
commit d143904aa9
2 changed files with 22 additions and 1 deletions

View File

@ -17,7 +17,7 @@ type configDrive struct {
}
func NewDatasource(root string) *configDrive {
return &configDrive{path.Join(root, "openstack"), ioutil.ReadFile}
return &configDrive{root, ioutil.ReadFile}
}
func (cd *configDrive) IsAvailable() bool {

View File

@ -112,3 +112,24 @@ func TestCDConfigRoot(t *testing.T) {
}
}
}
func TestNewDatasource(t *testing.T) {
for _, tt := range []struct {
root string
expectRoot string
}{
{
root: "",
expectRoot: "",
},
{
root: "/media/configdrive",
expectRoot: "/media/configdrive",
},
} {
service := NewDatasource(tt.root)
if service.root != tt.expectRoot {
t.Fatalf("bad root (%q): want %q, got %q", tt.root, tt.expectRoot, service.root)
}
}
}