Properly parse datastore paths

vmware · Oct 25, 2017 · 2c23714 · 2c23714
1 parent 048fa60
commit 2c23714
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/apiservers/service/restapi/handlers/vch_get.go b/lib/apiservers/service/restapi/handlers/vch_get.go
@@ -27,6 +27,7 @@ import (
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/strfmt"
 
+	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/types"
 
 	"github.com/vmware/vic/lib/apiservers/service/models"
@@ -189,6 +190,12 @@ func vchToModel(op trace.Operation, vch *vm.VirtualMachine, d *data.Data, execut
 
 	volumeLocations := make([]*models.VCHStorageVolumeStoresItems0, 0, len(vchConfig.Storage.VolumeLocations))
 	for label, path := range vchConfig.Storage.VolumeLocations {
+		parsed_path := object.DatastorePath{}
+		parsed := parsed_path.FromString(path.Path)
+		if parsed {
+			path.Path = parsed_path.Path
+		}
+
 		volume := models.VCHStorageVolumeStoresItems0{Datastore: path.String(), Label: label}
 		volumeLocations = append(volumeLocations, &volume)
 	}
@@ -312,7 +319,6 @@ func asKB(value *int) *models.ValueBytesMetric {
 	return asBytesMetric(value, models.ValueBytesMetricUnitsKB)
 }
 
-
 func asMHz(value *int) *models.ValueHertz {
 	if value == nil {
 		return nil

diff --git a/tests/test-cases/Group23-VIC-Machine-Service/23-03-VCH-Create.robot b/tests/test-cases/Group23-VIC-Machine-Service/23-03-VCH-Create.robot
@@ -207,7 +207,7 @@ Create complex VCH
     Property Should Be Equal        .endpoint.memory.units               MiB
 
     Property Should Contain         .storage.image_stores[0]             %{TEST_DATASTORE}
-    #Property Should Contain         .storage.volume_stores[0].datastore  %{TEST_DATASTORE}/test-volumes/foo
+    Property Should Contain         .storage.volume_stores[0].datastore  %{TEST_DATASTORE}/test-volumes/foo
     Property Should Contain         .storage.volume_stores[0].label      foo
     Property Should Be Equal        .storage.base_image_size.value       16000
     Property Should Be Equal        .storage.base_image_size.units       KB