diff --git a/go.mod b/go.mod index b2d314c4..895f9071 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/Azure/go-autorest/autorest v0.9.0 github.com/Azure/go-autorest/autorest/date v0.2.0 github.com/google/uuid v1.3.0 - github.com/microsoft/moc v0.11.0-alpha.24 + github.com/microsoft/moc v0.11.0-alpha.26-shengl-isolated-container.1 google.golang.org/grpc v1.54.0 k8s.io/klog v1.0.0 ) diff --git a/go.sum b/go.sum index bf4b0b39..d09ca730 100644 --- a/go.sum +++ b/go.sum @@ -579,8 +579,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= -github.com/microsoft/moc v0.11.0-alpha.24 h1:UYeqBWu3BwFn7XQ3bMNCFQFwm6yNAWwA1j8cz+jS950= -github.com/microsoft/moc v0.11.0-alpha.24/go.mod h1:XCARfNxCWJgQoKZGfggyj/lOF25XAxFYOuwAboxRCTc= +github.com/microsoft/moc v0.11.0-alpha.26-shengl-isolated-container.1 h1:BMTzflwMW3m4N7M7UYlvQe2ld/3pks0sZ/ZmiaWUOvg= +github.com/microsoft/moc v0.11.0-alpha.26-shengl-isolated-container.1/go.mod h1:EuYNwYdC667rnJSYcLcLHKTuQURy9GLm7n+SMDhK6ps= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -744,8 +744,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/services/storage/container/container.go b/services/storage/container/container.go index 42cee13d..d4d5dc20 100644 --- a/services/storage/container/container.go +++ b/services/storage/container/container.go @@ -38,6 +38,7 @@ func getWssdContainer(c *storage.Container, locationName string) (*wssdcloudstor if c.Path != nil { wssdcontainer.Path = *c.Path } + wssdcontainer.Isolated = c.Isolated } return wssdcontainer, nil } @@ -65,6 +66,7 @@ func getContainer(c *wssdcloudstorage.Container, location string) *storage.Conta ContainerProperties: &storage.ContainerProperties{ Statuses: status.GetStatuses(c.GetStatus()), Path: &c.Path, + Isolated: c.Isolated, ContainerInfo: &storage.ContainerInfo{ AvailableSize: availSize, TotalSize: totalSize, diff --git a/services/storage/storage.go b/services/storage/storage.go index a2c78a0c..be594eec 100644 --- a/services/storage/storage.go +++ b/services/storage/storage.go @@ -65,7 +65,8 @@ type ContainerInfo struct { // ContainerProperties defines the structure of a Load Balancer type ContainerProperties struct { // Path - Path *string `json:"path,omitempty"` + Path *string `json:"path,omitempty"` + Isolated bool `json:"isolated,omitempty"` // State - State Statuses map[string]*string `json:"statuses"` *ContainerInfo `json:"info"`